Merge branch '2.2'

keradus · keradus · commit 8d3f905c6304 · 2017-04-19T13:47:32.000+02:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -30,7 +30,6 @@ install:
     - echo extension=php_openssl.dll >> php.ini
     - IF NOT EXIST C:\tools\composer.phar (cd C:\tools && appveyor DownloadFile https://getcomposer.org/download/1.4.1/composer.phar)
     - cd C:\projects\php-cs-fixer
-    - git config --global github.accesstoken 5e7538aa415005c606ea68de2bbbade0409b4b8c
     - php C:\tools\composer.phar global show -ND 2>1 | findstr "hirak/prestissimo" || php C:\tools\composer.phar global require hirak/prestissimo
 
 before_test:
diff --git a/README.rst b/README.rst
@@ -300,7 +300,7 @@ Choose from the list of available rules:
   - ``space`` (``'none'``, ``'single'``): spacing to apply around the equal sign;
     defaults to ``'none'``
 
-* **declare_strict_types**
+* **declare_strict_types** [@PHP70Migration:risky]
 
   Force strict types declaration in all files. Requires PHP >= 7.0.
 
diff --git a/src/RuleSet.php b/src/RuleSet.php
@@ -161,6 +161,9 @@ final class RuleSet implements RuleSetInterface
             ),
             'ternary_to_null_coalescing' => true,
         ),
+        '@PHP70Migration:risky' => array(
+            'declare_strict_types' => true,
+        ),
         '@PHP71Migration' => array(
             '@PHP70Migration' => true,
             'visibility_required' => array(
diff --git a/tests/AutoReview/FixerTest.php b/tests/AutoReview/FixerTest.php
@@ -166,8 +166,8 @@ private function getAllFixers()
     /**
      * copy paste from GeckoPackages/GeckoPHPUnit StringsAssertTrait, to replace with Trait when possible.
      *
-     * @param mixed $actual
-     * @param mixed $message
+     * @param mixed  $actual
+     * @param string $message
      */
     private static function assertStringIsNotEmpty($actual, $message = '')
     {
diff --git a/tests/Fixer/Import/OrderedImportsFixerTest.php b/tests/Fixer/Import/OrderedImportsFixerTest.php
@@ -1477,11 +1477,11 @@ public function testByLengthWithoutUses()
     }
 
     /**
+     * @param string      $expected
+     * @param string|null $input
+     *
      * @dataProvider provide70CasesByLength
      * @requires PHP 7.0
-     *
-     * @param mixed $expected
-     * @param mixed $input
      */
     public function test70ByLength($expected, $input = null)
     {
@@ -1535,8 +1535,8 @@ public function provide70CasesByLength()
      * @dataProvider provide70TypesOrderAndLength
      * @requires PHP 7.0
      *
-     * @param mixed $expected
-     * @param mixed $input
+     * @param string      $expected
+     * @param string|null $input
      */
     public function test70TypesOrderAndLength($expected, $input = null)
     {
@@ -1594,14 +1594,15 @@ public function provide70TypesOrderAndLength()
      * @dataProvider provide70TypesOrderAndAlphabet
      * @requires PHP 7.0
      *
-     * @param mixed $expected
-     * @param mixed $input
+     * @param string      $expected
+     * @param string|null $input
+     * @param string[]    $importOrder
      */
-    public function test70TypesOrderAndAlphabet($expected, $input = null)
+    public function test70TypesOrderAndAlphabet($expected, $input = null, array $importOrder = null)
     {
         $this->fixer->configure(array(
             'sortAlgorithm' => OrderedImportsFixer::SORT_ALPHA,
-            'importsOrder' => array(OrderedImportsFixer::IMPORT_TYPE_CLASS, OrderedImportsFixer::IMPORT_TYPE_CONST, OrderedImportsFixer::IMPORT_TYPE_FUNCTION),
+            'importsOrder' => $importOrder,
         ));
 
         $this->doTest($expected, $input);
@@ -1655,6 +1656,7 @@ public function provide70TypesOrderAndAlphabet()
 use const some\b\{ConstE};
 use function some\a\{fn_a, fn_b};
 ',
+                array(OrderedImportsFixer::IMPORT_TYPE_CLASS, OrderedImportsFixer::IMPORT_TYPE_CONST, OrderedImportsFixer::IMPORT_TYPE_FUNCTION),
             ),
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,8 @@ private function getAllFixers()`
`166`	`166`	`/**`
`167`	`167`	`* copy paste from GeckoPackages/GeckoPHPUnit StringsAssertTrait, to replace with Trait when possible.`
`168`	`168`	`*`
`169`		`- * @param mixed $actual`
`170`		`- * @param mixed $message`
	`169`	`+ * @param mixed $actual`
	`170`	`+ * @param string $message`
`171`	`171`	`*/`
`172`	`172`	`private static function assertStringIsNotEmpty($actual, $message = '')`
`173`	`173`	`{`