Test PHP 7.4 in travis & upgrade PHPStan

iquito · iquito · commit 6bf93d112f55 · 2019-12-20T19:48:07.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -10,6 +10,8 @@
 /ruleset.xml        export-ignore
 /.editorconfig      export-ignore
 /phpstan.neon       export-ignore
+/phpstan_base.neon  export-ignore
+/phpstan-baseline.neon export-ignore
 /psalm.xml          export-ignore
 /psalm-baseline.xml export-ignore
 /vendor-bin         export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ language: php
 php:
     - '7.2'
     - '7.3'
+    - '7.4'
 
 before_script:
     - composer self-update
@@ -15,10 +16,10 @@ before_script:
     - ./cc-test-reporter before-build
 
 script:
-    - vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
-    - vendor/bin/phpstan analyse src --level=7
-    - vendor/bin/psalm
-    - vendor/bin/phpcs --standard=ruleset.xml --extensions=php src tests
+    - composer phpunit_clover
+    - composer phpstan
+    - composer psalm
+    - composer phpcs
     - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build  -t clover --exit-code $TRAVIS_TEST_RESULT; fi
 
 notifications:
diff --git a/captainhook.json b/captainhook.json
@@ -25,22 +25,22 @@
                 "conditions": []
             },
             {
-                "action": "vendor/bin/phpunit",
+                "action": "composer phpunit",
                 "options": [],
                 "conditions": []
             },
             {
-                "action": "vendor/bin/phpstan analyse src --level=7",
+                "action": "composer phpstan",
                 "options": [],
                 "conditions": []
             },
             {
-                "action": "vendor/bin/psalm",
+                "action": "composer psalm",
                 "options": [],
                 "conditions": []
             },
             {
-                "action": "vendor/bin/phpcs --standard=ruleset.xml --extensions=php --cache src tests",
+                "action": "composer phpcs",
                 "options": [],
                 "conditions": []
             }
diff --git a/composer.json b/composer.json
@@ -43,15 +43,18 @@
         }
     },
     "scripts": {
-        "bin": "echo 'bin not installed'",
         "post-install-cmd": ["@composer bin all install --ansi"],
         "post-update-cmd": ["@composer bin all update --ansi"],
-        "phpstan": "vendor/bin/phpstan analyse src --level=7",
+        "phpstan": "vendor/bin/phpstan analyse",
+        "phpstan_base": "vendor/bin/phpstan analyse --configuration phpstan_base.neon --error-format baselineNeon > phpstan-baseline.neon",
         "psalm": "vendor/bin/psalm --show-info=false",
         "psalm_base": "vendor/bin/psalm --set-baseline=psalm-baseline.xml",
         "phpunit": "vendor/bin/phpunit --colors=always",
+        "phpunit_clover": "vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml",
         "phpcs": "vendor/bin/phpcs --standard=ruleset.xml --extensions=php --cache src tests",
         "phpcsfix": "vendor/bin/phpcbf --standard=ruleset.xml --extensions=php --cache src tests",
-        "codecoverage": "vendor/bin/phpunit --coverage-html tests/_reports"
+        "codecoverage": "vendor/bin/phpunit --coverage-html tests/_reports",
+        "binupdate": "@composer bin all update --ansi",
+        "bininstall": "@composer bin all install --ansi"
     }
 }
diff --git a/examples/Order.php b/examples/Order.php
@@ -17,6 +17,8 @@ class Order
      * @Assert\NotNull()
      * @Assert\Type(type="Squirrel\ValidatorCascade\Examples\Address")
      * @Cascade(trigger={"Default", "phoneNumberMandatory"})
+     *
+     * @var Address
      */
     public $shippingAddress;
 
@@ -30,6 +32,8 @@ class Order
      * @Assert\NotNull()
      * @Assert\Type(type="Squirrel\ValidatorCascade\Examples\Address")
      * @Cascade(groups="alternateInvoiceAddress")
+     *
+     * @var Address
      */
     public $invoiceAddress;
 
@@ -40,6 +44,8 @@ class Order
      * @Assert\NotNull()
      * @Assert\Type(type="Squirrel\ValidatorCascade\Examples\Address")
      * @Cascade(trigger="phoneNumberMandatory")
+     *
+     * @var Address
      */
     public $phoneNumberOnlyAddress;
 }
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,9 @@
+includes:
+    - phpstan-baseline.neon
+
+parameters:
+    level: 8
+    paths:
+        - src
+        - examples
+    checkMissingIterableValueType: false
diff --git a/phpstan_base.neon b/phpstan_base.neon
@@ -0,0 +1,6 @@
+parameters:
+    level: 8
+    paths:
+        - src
+        - examples
+    checkMissingIterableValueType: false
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="3.7.2@d9cae720c1af31db9ba27c2bc1fcf9b0dd092fb0">
+  <file src="examples/Address.php">
+    <MissingConstructor occurrences="1">
+      <code>$street</code>
+    </MissingConstructor>
+  </file>
+  <file src="examples/Order.php">
+    <MissingConstructor occurrences="1">
+      <code>$shippingAddress</code>
+    </MissingConstructor>
+  </file>
+</files>
diff --git a/psalm.xml b/psalm.xml
@@ -4,9 +4,11 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src" />
+        <directory name="examples" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>
diff --git a/vendor-bin/phpcs/composer.lock b/vendor-bin/phpcs/composer.lock
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "phpstan/phpstan": "^0.11.19"
+        "phpstan/phpstan": "^0.12"
     }
 }
diff --git a/vendor-bin/phpstan/composer.lock b/vendor-bin/phpstan/composer.lock
diff --git a/vendor-bin/phpunit/composer.lock b/vendor-bin/phpunit/composer.lock
diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -25,22 +25,22 @@`
`25`	`25`	`"conditions": []`
`26`	`26`	`},`
`27`	`27`	`{`
`28`		`- "action": "vendor/bin/phpunit",`
	`28`	`+ "action": "composer phpunit",`
`29`	`29`	`"options": [],`
`30`	`30`	`"conditions": []`
`31`	`31`	`},`
`32`	`32`	`{`
`33`		`- "action": "vendor/bin/phpstan analyse src --level=7",`
	`33`	`+ "action": "composer phpstan",`
`34`	`34`	`"options": [],`
`35`	`35`	`"conditions": []`
`36`	`36`	`},`
`37`	`37`	`{`
`38`		`- "action": "vendor/bin/psalm",`
	`38`	`+ "action": "composer psalm",`
`39`	`39`	`"options": [],`
`40`	`40`	`"conditions": []`
`41`	`41`	`},`
`42`	`42`	`{`
`43`		`- "action": "vendor/bin/phpcs --standard=ruleset.xml --extensions=php --cache src tests",`
	`43`	`+ "action": "composer phpcs",`
`44`	`44`	`"options": [],`
`45`	`45`	`"conditions": []`
`46`	`46`	`}`