Merge pull request #27 from redthor/v2/array-bracket-syntax

V2/array bracket syntax

Author: caciobanu

.gitignore

@@ -5,3 +5,4 @@ vendor/
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 composer.lock
+.php_cs.cache

.php_cs.dist

@@ -0,0 +1,17 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+;
+
+$config = PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        '@Symfony' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'concat_space' => ['spacing' => 'one'],
+    ])
+    ->setFinder($finder)
+;
+
+return $config;

.travis.yml

@@ -7,11 +7,11 @@ cache:
 
 matrix:
   include:
-    # Test the latest
+    # Test the latest dependencies
     - php: 7.1
     - php: 7.2
 
-    # Test with the lowest deps
+    # Test with the lowest dependencies
     - php: 7.2
       env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest --prefer-dist"
 
@@ -22,7 +22,7 @@ before_script:
   - composer config "platform.ext-mongo" "1.6.16"
   - composer self-update
   # To be removed when this issue is resolved: https://github.com/composer/composer/issues/5355
-  - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --ignore-platform-reqs --quiet; fi
+  - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
   - composer update -v ${COMPOSER_FLAGS}
 
 script:

README.md

@@ -41,16 +41,16 @@ Example Connection configuration "test\_antimattr\_mongodb.php"
 /**
  * @link http://php.net/manual/en/mongoclient.construct.php
  */
-return array(
+return [
     'host' => 'localhost', // default is localhost
     'port' => '27017', // default is 27017
     'dbname' => null, // optional, if authentication DB is required
     'user' => null, // optional, if authentication is required
     'password' => null, // optional, if authentication is required
-    'options' => array(
+    'options' => [
         'connect' => true // recommended
-    )
-);
+    ]
+];
 ```
 
 XML or YAML Migration Configurations are supported
@@ -103,13 +103,13 @@ use AntiMattr\MongoDB\Migrations\Tools\Console\Command as AntiMattr;
 use Symfony\Component\Console\Application;
 
 $application = new Application();
-$application->addCommands(array(
+$application->addCommands([
     new AntiMattr\ExecuteCommand(),
     new AntiMattr\GenerateCommand(),
     new AntiMattr\MigrateCommand(),
     new AntiMattr\StatusCommand(),
     new AntiMattr\VersionCommand()
-));
+]);
 $application->run();
 ```
 
@@ -343,8 +343,3 @@ Don't have the pre-commit hook running, please make sure to run the fixer/sniffe
 $ vendor/bin/php-cs-fixer fix src/
 $ vendor/bin/php-cs-fixer fix tests/
 ```
-
-PHP 7
------
-Please run before:
-composer require alcaeus/mongo-php-adapter

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

@@ -20,27 +20,26 @@ public function up(Database $db)
         $testA = $db->selectCollection('test_a');
         $this->analyze($testA);
 
-        $testA->ensureIndex(array('actor' => -1));
+        $testA->ensureIndex(['actor' => -1]);
     }
 
     public function down(Database $db)
     {
         // this down() migration is auto-generated, please modify it to your needs
-
     }
 
     /**
-	 * This preUp is not required
-	 * I use it to demonstrate the analyzer
-	 */
+     * This preUp is not required
+     * I use it to demonstrate the analyzer.
+     */
     public function preUp(Database $db)
     {
         $testA = $db->selectCollection('test_a');
 
-        $testDocuments = array();
+        $testDocuments = [];
 
-        for ($i = 0; $i < 100; $i++) {
-            $testDocument = array();
+        for ($i = 0; $i < 100; ++$i) {
+            $testDocument = [];
             $testDocument['iteration'] = $i;
             $testDocument['actor'] = $this->generateRandomString();
             $testDocument['object'] = $this->generateRandomString();
@@ -53,9 +52,9 @@ public function preUp(Database $db)
     }
 
     /**
-	 * This postUp is not required
-	 * I use it to demonstrate the analyzer
-	 */
+     * This postUp is not required
+     * I use it to demonstrate the analyzer.
+     */
     public function postUp(Database $db)
     {
         $testA = $db->selectCollection('test_a');
@@ -67,7 +66,7 @@ private function generateRandomString()
         $length = rand(10, 50);
         $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
         $randomString = '';
-        for ($i = 0; $i < $length; $i++) {
+        for ($i = 0; $i < $length; ++$i) {
             $randomString .= $characters[rand(0, strlen($characters) - 1)];
         }
 

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

@@ -27,21 +27,20 @@ public function up(Database $db)
     public function down(Database $db)
     {
         // this down() migration is auto-generated, please modify it to your needs
-
     }
 
     /**
      * This preUp is not required
-     * I use it to demonstrate the analyzer
+     * I use it to demonstrate the analyzer.
      */
     public function preUp(Database $db)
     {
         $testA = $db->selectCollection('test_a');
 
-        $testDocuments = array();
+        $testDocuments = [];
 
-        for ($i = 0; $i < 100; $i++) {
-            $testDocument = array();
+        for ($i = 0; $i < 100; ++$i) {
+            $testDocument = [];
             $testDocument['iteration'] = $i;
             $testDocument['actor'] = $this->generateRandomString();
             $testDocument['object'] = $this->generateRandomString();
@@ -55,7 +54,7 @@ public function preUp(Database $db)
 
     /**
      * This postUp is not required
-     * I use it to demonstrate the analyzer
+     * I use it to demonstrate the analyzer.
      */
     public function postUp(Database $db)
     {
@@ -68,7 +67,7 @@ private function generateRandomString()
         $length = rand(10, 50);
         $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
         $randomString = '';
-        for ($i = 0; $i < $length; $i++) {
+        for ($i = 0; $i < $length; ++$i) {
             $randomString .= $characters[rand(0, strlen($characters) - 1)];
         }
 

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

@@ -21,12 +21,10 @@ public function getDescription()
     public function up(Database $db)
     {
         // this up() migration is auto-generated, please modify it to your needs
-
     }
 
     public function down(Database $db)
     {
         // this down() migration is auto-generated, please modify it to your needs
-
     }
 }

demo/ConsoleApplication/config/test_antimattr_mongodb.php

@@ -1,15 +1,15 @@
 <?php
 
 /**
- * @link http://php.net/manual/en/mongoclient.construct.php
+ * @see http://php.net/manual/en/mongoclient.construct.php
  */
-return array(
+return [
     'host' => 'localhost', // default is localhost
     'port' => '27017', // default is 27017
     'dbname' => null, // optional, if authentication DB is required
     'user' => null, // optional, if authentication is required
     'password' => null, // optional, if authentication is required
-    'options' => array(
-        'connect' => true // recommended
-    )
-);
+    'options' => [
+        'connect' => true, // recommended
+    ],
+];

src/AntiMattr/MongoDB/Migrations/AbstractMigration.php

@@ -11,7 +11,6 @@
 
 namespace AntiMattr\MongoDB\Migrations;
 
-use AntiMattr\MongoDB\Migrations\Configuration\Configuration;
 use AntiMattr\MongoDB\Migrations\Exception\AbortException;
 use AntiMattr\MongoDB\Migrations\Exception\IrreversibleException;
 use AntiMattr\MongoDB\Migrations\Exception\SkipException;
@@ -65,7 +64,9 @@ public function __construct(Version $version)
      * @return string
      */
     abstract public function getDescription();
+
     abstract public function up(Database $db);
+
     abstract public function down(Database $db);
 
     /**
@@ -100,7 +101,7 @@ protected function write($message)
      */
     protected function throwIrreversibleMigrationException($message = null)
     {
-        if ($message === null) {
+        if (null === $message) {
             $message = 'This migration is irreversible and cannot be reverted.';
         }
         throw new IrreversibleException($message);
@@ -116,8 +117,8 @@ public function warnIf($condition, $message = '')
     {
         $message = (strlen($message)) ? $message : 'Unknown Reason';
 
-        if ($condition === true) {
-            $this->outputWriter->write('    <warning>Warning during '.$this->version->getExecutionState().': '.$message.'</warning>');
+        if (true === $condition) {
+            $this->outputWriter->write('    <warning>Warning during ' . $this->version->getExecutionState() . ': ' . $message . '</warning>');
         }
     }
 
@@ -133,7 +134,7 @@ public function abortIf($condition, $message = '')
     {
         $message = (strlen($message)) ? $message : 'Unknown Reason';
 
-        if ($condition === true) {
+        if (true === $condition) {
             throw new AbortException($message);
         }
     }
@@ -150,7 +151,7 @@ public function skipIf($condition, $message = '')
     {
         $message = (strlen($message)) ? $message : 'Unknown Reason';
 
-        if ($condition === true) {
+        if (true === $condition) {
             throw new SkipException($message);
         }
     }

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

@@ -29,7 +29,7 @@ class Statistics
     const PADDING_FACTOR = 'paddingFactor';
     const TOTAL_INDEX_SIZE = 'totalIndexSize';
 
-    public static $metrics = array(
+    public static $metrics = [
         self::COUNT,
         self::SIZE,
         self::AVG_OBJ_SIZE,
@@ -39,7 +39,7 @@ class Statistics
         self::LAST_EXTENT_SIZE,
         self::PADDING_FACTOR,
         self::TOTAL_INDEX_SIZE,
-    );
+    ];
 
     /**
      * @var Doctrine\MongoDB\Collection
@@ -49,12 +49,12 @@ class Statistics
     /**
      * @var array
      */
-    private $before = array();
+    private $before = [];
 
     /**
      * @var array
      */
-    private $after = array();
+    private $after = [];
 
     /**
      * @param Doctrine\MongoDB\Collection
@@ -119,7 +119,7 @@ protected function getCollectionStats()
         $name = $this->collection->getName();
 
         try {
-            if (!$data = $database->command(array('collStats' => $name))) {
+            if (!$data = $database->command(['collStats' => $name])) {
                 $message = sprintf(
                     'Statistics not found for collection %s',
                     $name
@@ -135,6 +135,6 @@ protected function getCollectionStats()
             throw $e;
         }
 
-        return array();
+        return [];
     }
 }