Merge pull request #49 from smoench/symfony-5-support

symfony 5 support

Author: caciobanu

composer.json

@@ -16,8 +16,8 @@
         "php": "^7.1",
         "ext-mongodb": "*",
         "mongodb/mongodb": "^1.4",
-        "symfony/console": "^2.7|^3.4|^4",
-        "symfony/yaml": "^2.7|^3.4|^4"
+        "symfony/console": "^2.7 || ^3.4 || ^4.0 || ^5.0",
+        "symfony/yaml": "^2.7 || ^3.4 || ^4.0 || ^5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0",

demo/ConsoleApplication/Example/Migrations/TestAntiMattr/MongoDB/Version20140822185742.php

@@ -3,7 +3,7 @@
 namespace Example\Migrations\TestAntiMattr\MongoDB;
 
 use AntiMattr\MongoDB\Migrations\AbstractMigration;
-use \MongoDB\Database;
+use MongoDB\Database;
 
 class Version20140822185742 extends AbstractMigration
 {

demo/ConsoleApplication/Example/Migrations/TestAntiMattr/MongoDB/Version20140822185743.php

@@ -3,7 +3,7 @@
 namespace Example\Migrations\TestAntiMattr\MongoDB;
 
 use AntiMattr\MongoDB\Migrations\AbstractMigration;
-use \MongoDB\Database;
+use MongoDB\Database;
 
 class Version20140822185743 extends AbstractMigration
 {

demo/ConsoleApplication/Example/Migrations/TestAntiMattr/MongoDB/Version20140822185744.php

@@ -3,7 +3,7 @@
 namespace Example\Migrations\TestAntiMattr\MongoDB;
 
 use AntiMattr\MongoDB\Migrations\AbstractMigration;
-use \MongoDB\Database;
+use MongoDB\Database;
 
 /**
  * Auto-generated Migration: Please modify to your needs!

src/AntiMattr/MongoDB/Migrations/AbstractMigration.php

@@ -14,8 +14,8 @@
 use AntiMattr\MongoDB\Migrations\Exception\AbortException;
 use AntiMattr\MongoDB\Migrations\Exception\IrreversibleException;
 use AntiMattr\MongoDB\Migrations\Exception\SkipException;
-use \MongoDB\Collection;
-use \MongoDB\Database;
+use MongoDB\Collection;
+use MongoDB\Database;
 
 /**
  * @author Matthew Fitzgerald <matthewfitz@gmail.com>

src/AntiMattr/MongoDB/Migrations/Collection/Statistics.php

@@ -11,8 +11,8 @@
 
 namespace AntiMattr\MongoDB\Migrations\Collection;
 
-use \MongoDB\Collection;
 use Exception;
+use MongoDB\Collection;
 use MongoDB\Database;
 
 /**

src/AntiMattr/MongoDB/Migrations/Configuration/Configuration.php

@@ -103,7 +103,6 @@ class Configuration
     private $file;
 
     /**
-     * @param \MongoDB\Client               $connection
      * @param \AntiMattr\MongoDB\Migrations\OutputWriter $outputWriter
      */
     public function __construct(Client $connection, OutputWriter $outputWriter = null)
@@ -297,9 +296,6 @@ public function setFile($file)
         return $this;
     }
 
-    /**
-     * @return string|null
-     */
     public function getFile(): ?string
     {
         return $this->file;
@@ -328,8 +324,6 @@ public function getMigratedVersions()
      *
      * @param string $version
      *
-     * @return int
-     *
      * @throws AntiMattr\MongoDB\Migrations\Exception\UnknownVersionException Throws exception if migration version does not exist
      * @throws DomainException                                                If more than one version exists
      */
@@ -347,9 +341,7 @@ public function getMigratedTimestamp($version): int
         }
 
         if (count($result) > 1) {
-            throw new \DomainException(
-                'Unexpected duplicate version records in the database'
-            );
+            throw new \DomainException('Unexpected duplicate version records in the database');
         }
 
         $returnVersion = $result[0];
@@ -448,9 +440,6 @@ public function registerMigration($version, $class)
      * Register an array of migrations. Each key of the array is the version and
      * the value is the migration class name.
      *
-     *
-     * @param array $migrations
-     *
      * @return Version[]
      */
     public function registerMigrations(array $migrations)
@@ -524,8 +513,6 @@ public function hasVersion($version)
     /**
      * Check if a version has been migrated or not yet.
      *
-     * @param \AntiMattr\MongoDB\Migrations\Version $version
-     *
      * @return bool
      */
     public function hasVersionMigrated(Version $version)
@@ -563,6 +550,7 @@ public function getCurrentVersion()
         }
 
         $version = $versions[0];
+
         return $version['v'];
     }
 

src/AntiMattr/MongoDB/Migrations/Configuration/ConfigurationBuilder.php

@@ -55,43 +55,25 @@ private function __construct()
         ];
     }
 
-    /**
-     * @return ConfigurationBuilder
-     */
     public static function create(): ConfigurationBuilder
     {
         return new static();
     }
 
-    /**
-     * @param Client $connection
-     *
-     * @return ConfigurationBuilder
-     */
     public function setConnection(Client $connection): ConfigurationBuilder
     {
         $this->connection = $connection;
 
         return $this;
     }
 
-    /**
-     * @param OutputWriter $outputWriter
-     *
-     * @return ConfigurationBuilder
-     */
     public function setOutputWriter(OutputWriter $outputWriter): ConfigurationBuilder
     {
         $this->outputWriter = $outputWriter;
 
         return $this;
     }
 
-    /**
-     * @param string|null $configFile
-     *
-     * @return ConfigurationBuilder
-     */
     public function setOnDiskConfiguration(?string $configFile = null): ConfigurationBuilder
     {
         $this->configFile = $configFile;
@@ -120,12 +102,7 @@ public function setOnDiskConfiguration(?string $configFile = null): Configuratio
                     break;
 
                 default:
-                    throw new \InvalidArgumentException(
-                        sprintf(
-                            'The specified config file should end in .xml or .yml/.yaml. Unrecognized extension [%s]',
-                            $fileExt
-                        )
-                    );
+                    throw new \InvalidArgumentException(sprintf('The specified config file should end in .xml or .yml/.yaml. Unrecognized extension [%s]', $fileExt));
             }
 
             $this->configParams = array_merge($this->configParams, $diskConfig);
@@ -134,9 +111,6 @@ public function setOnDiskConfiguration(?string $configFile = null): Configuratio
         return $this;
     }
 
-    /**
-     * @return Configuration
-     */
     public function build(): Configuration
     {
         $config = new Configuration($this->connection, $this->outputWriter);
@@ -177,11 +151,6 @@ public function build(): Configuration
         return $config;
     }
 
-    /**
-     * @param string $configFile
-     *
-     * @return array
-     */
     private function loadXmlFile(string $configFile): array
     {
         $xml = simplexml_load_file($configFile);
@@ -225,11 +194,6 @@ private function loadXmlFile(string $configFile): array
 
     /**
      * Get the path to the directory relative to the config file.
-     *
-     * @param string      $configFile
-     * @param string|null $directory
-     *
-     * @return string|null
      */
     protected function getDirectoryRelativeToFile(string $configFile, ?string $directory = null): ?string
     {

src/AntiMattr/MongoDB/Migrations/Configuration/Timestamp.php

@@ -49,9 +49,7 @@ public function getTimestamp(): int
         );
 
         if (!$this->t || !is_object($this->t)) {
-            throw new \DomainException(
-                'The timestamp to normalise must be one of ' . $supportedClasses . ' but it is not an object'
-            );
+            throw new \DomainException('The timestamp to normalise must be one of ' . $supportedClasses . ' but it is not an object');
         }
 
         switch (get_class($this->t)) {
@@ -72,14 +70,9 @@ public function getTimestamp(): int
             return $this->t->getTimestamp();
         }
 
-        throw new \DomainException(
-            'The normalised timestamp must be one of ' . $supportedClasses
-        );
+        throw new \DomainException('The normalised timestamp must be one of ' . $supportedClasses);
     }
 
-    /**
-     * @return string
-     */
     public function __toString(): string
     {
         return (string) $this->getTimestamp();

src/AntiMattr/MongoDB/Migrations/Migration.php

@@ -12,8 +12,8 @@
 namespace AntiMattr\MongoDB\Migrations;
 
 use AntiMattr\MongoDB\Migrations\Configuration\Configuration;
-use AntiMattr\MongoDB\Migrations\Exception\UnknownVersionException;
 use AntiMattr\MongoDB\Migrations\Exception\NoMigrationsToExecuteException;
+use AntiMattr\MongoDB\Migrations\Exception\UnknownVersionException;
 
 /**
  * @author Matthew Fitzgerald <matthewfitz@gmail.com>