Merge pull request #547 from dunglas/yoda-style

Add more php-cs-fixer rules

Author: OndraM

.php_cs.dist

@@ -12,6 +12,7 @@ return PhpCsFixer\Config::create()
         'cast_spaces' => true,
         'concat_space' => ['spacing' => 'one'],
         'function_typehint_space' => true,
+        'general_phpdoc_annotation_remove' => ['author'],
         'linebreak_after_opening_tag' => true,
         'lowercase_cast' => true,
         'mb_str_functions' => true,
@@ -50,6 +51,9 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'php_unit_construct' => true,
         'php_unit_dedicate_assert' => true,
+        'php_unit_expectation' => true,
+        'php_unit_mock' => true,
+        'php_unit_no_expectation_annotation' => true,
         'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_indent' => true,
         'phpdoc_no_access' => true,
@@ -73,6 +77,7 @@ return PhpCsFixer\Config::create()
         'unary_operator_spaces' => true,
         'visibility_required' => true,
         'whitespace_after_comma_in_array' => true,
+        'yoda_style' => false,
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder);

composer.json

@@ -45,11 +45,11 @@
   },
   "scripts": {
     "codestyle:check": [
-      "vendor/bin/php-cs-fixer fix --diff --dry-run",
+      "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --dry-run -vvv --ansi",
       "vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/"
     ],
     "codestyle:fix": [
-      "vendor/bin/php-cs-fixer fix --diff || exit 0",
+      "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff -vvv || exit 0",
       "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
     ],
     "analyze": [

tests/unit/Remote/DesiredCapabilitiesTest.php

@@ -62,12 +62,11 @@ public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters()
         $this->assertSame(333, $capabilities->getVersion());
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage isJavascriptEnabled() is a htmlunit-only option
-     */
     public function testShouldNotAllowToDisableJavascriptForNonHtmlUnitBrowser()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('isJavascriptEnabled() is a htmlunit-only option');
+
         $capabilities = new DesiredCapabilities();
         $capabilities->setBrowserName(WebDriverBrowserType::FIREFOX);
         $capabilities->setJavascriptEnabled(false);