Merge pull request #3 from Oefenweb/consistency-changes

Consistency changes
Oefenweb · Sep 20, 2019 · f46995f · f46995f
2 parents 3ad54b4 + 7312634
commit f46995f
Show file tree

Hide file tree

Showing 28 changed files with 481 additions and 3,927 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ Thumbs.db
 !empty
 /node_modules
 /vendor
+composer.lock
diff --git a/.phan/config.php b/.phan/config.php
diff --git a/.travis.yml b/.travis.yml
@@ -40,7 +40,7 @@ branches:
     - 3.x
 
 before_script:
-  - travis_wait ./.travis/before-script.sh
+  - ./.travis/before-script.sh
 
 script:
   - ./.travis/script.sh

diff --git a/.travis/after-success.sh b/.travis/after-success.sh
@@ -9,4 +9,4 @@ set -o pipefail;
 #
 if [ "${PHP_COVERAGE}" = '1' ]; then
     bash <(curl -s https://codecov.io/bash);
-fi
+fi
diff --git a/.travis/before-script.sh b/.travis/before-script.sh
@@ -17,6 +17,11 @@ elif [ "${PHP_CPD}" = '1' ]; then
     exit 0;
 elif [ "${PHP_MD}" = '1' ]; then
     exit 0;
+elif [ "${PHP_STAN}" = '1' ]; then
+    exit 0;
+elif [ "${PHP_PHAN}" = '1' ]; then
+    pecl install ast;
+    exit 0;
 fi
 
-composer require "cakephp/cakephp:${CAKE_VERSION}"  --dev --no-ansi --no-progress --no-interaction;
+composer require "cakephp/cakephp:${CAKE_VERSION}"  --dev --no-ansi --no-progress --no-interaction;
diff --git a/.travis/script.sh b/.travis/script.sh
@@ -30,8 +30,12 @@ elif [ "${PHP_MD}" = '1' ]; then
     excludePathsJoined=${excludePathsJoined:1};
 
     vendor/bin/phpmd . text phpmd.xml --suffixes php --exclude "${excludePathsJoined}";
+elif [ "${PHP_STAN}" = '1' ]; then
+    vendor/bin/phpstan analyse -c phpstan.neon -l 7 src/;
+elif [ "${PHP_PHAN}" = '1' ]; then
+    vendor/bin/phan;
 elif [ "${PHP_COVERAGE}" = '1' ]; then
     vendor/bin/phpunit --coverage-clover=clover.xml;
 else
     vendor/bin/phpunit;
-fi
+fi
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/composer.json b/composer.json
@@ -1,49 +1,51 @@
 {
-	"name": "oefenweb/cakephp-vat-number-check-webservice",
-	"description": "A VAT number check (Web Service) Plugin for CakePHP",
-	"type": "cakephp-plugin",
-	"keywords": [
-		"cakephp", "vat number"
-	],
-	"homepage": "http://github.com/Oefenweb/cakephp-vat-number-check-webservice",
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Oefenweb.nl BV team",
-			"homepage": "https://github.com/Oefenweb/cakephp-vat-number-check-webservice/contributors"
-		}
-	],
-	"require": {
-		"php": ">=7.1",
-		"cakephp/cakephp": "^3.8",
-		"ext-soap": "*",
-		"composer/installers": "~1.0"
-	},
-	"require-dev": {
-		"phpunit/phpunit": "^5.7.14|^6.0",
-		"oefenweb/cakephp-codesniffer": "^3.0.0",
+    "name": "oefenweb/cakephp-vat-number-check-webservice",
+    "description": "A VAT number check (Web Service) Plugin for CakePHP",
+    "type": "cakephp-plugin",
+    "keywords": [
+        "cakephp", "vat number"
+    ],
+    "homepage": "http://github.com/Oefenweb/cakephp-vat-number-check-webservice",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Oefenweb.nl BV team",
+            "homepage": "https://github.com/Oefenweb/cakephp-vat-number-check-webservice/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=7.1",
+        "cakephp/cakephp": "^3.8",
+        "ext-soap": "*",
+        "composer/installers": "~1.0"
+    },
+    "require-dev": {
+        "oefenweb/cakephp-codesniffer": "^3.0.0",
         "phpmd/phpmd": "^2.6",
-		"phpstan/phpstan": "^0.10.3",
-		"sebastian/phpcpd": "^3.0"
-	},
-	"autoload": {
+        "phpstan/phpstan": "^0.10.3",
+        "phpunit/phpunit": "^5.7.14|^6.0",
+        "psy/psysh": "@stable",
+        "sebastian/phpcpd": "^3.0",
+        "phan/phan": "^1.3"
+    },
+    "autoload": {
         "psr-4": {
-			"VatNumberCheck\\": "src",
-			"VatNumberCheck\\Test\\Fixture\\": "tests/Fixture/"
+            "VatNumberCheck\\": "src",
+            "VatNumberCheck\\Test\\Fixture\\": "tests/Fixture/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-			"VatNumberCheck\\Test\\TestApp\\": "tests/test_app/TestApp",
-			"VatNumberCheck\\Test\\": "tests",
+            "VatNumberCheck\\Test\\TestApp\\": "tests/test_app/TestApp",
+            "VatNumberCheck\\Test\\": "tests",
             "Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
         }
     },
-	"support": {
-		"issues": "https://github.com/Oefenweb/cakephp-vat-number-check-webservice/issues",
-		"source": "https://github.com/Oefenweb/cakephp-vat-number-check-webservice"
-	},
-	"extra": {
-		"installer-name": "VatNumberCheck"
-	}
+    "support": {
+        "issues": "https://github.com/Oefenweb/cakephp-vat-number-check-webservice/issues",
+        "source": "https://github.com/Oefenweb/cakephp-vat-number-check-webservice"
+    },
+    "extra": {
+        "installer-name": "VatNumberCheck"
+    }
 }