Merge pull request #35 from notpron/cakephp-3.x-upgrade

Cakephp 3.x upgrade

Author: tersmitten

.gitignore

@@ -22,3 +22,4 @@ Thumbs.db
 ###############
 !empty
 /node_modules
+/vendor

.phan/config.php

@@ -1,54 +1,54 @@
 language: php
 
+sudo: false
+
 php:
-  - 7.0
   - 7.1
-  - 7.2
 
 env:
   global:
-    - REPO_NAME=cakephp-queue
-    - PLUGIN_NAME=Queue
-    - REQUIRE=""
-    - DB=mysql CAKE_VERSION=2
-
-    - secure: "lMvqukdTy45r8VXnIaIKUI7i39dwDQ7u7yPeN019TVZDhYGa3ul9S0PxWYTXvyay+PqnEtCcp/dfwo57pLDfFKOnD6omLZiwFU4F10P8TIm6cnokw/4dnFEsZnK8fuvqDduwrSZwyTk9J1fvOYSOcGkOOm7y5AqSaDYEpQIPtuI="
+    - CAKE_VERSION=^3.7.0
+    - DB=mysql db_dsn='mysql://root@127.0.0.1/cakephp_test'
 
-  matrix:
-    - CAKE_VERSION=2.9
-    - CAKE_VERSION=2.10 PHPUNIT_VERSION=^5.7
+services:
+  - mysql
 
 matrix:
   include:
     - php: 7.1
       env:
-        - CODECOVERAGE=1 PHPUNIT_VERSION=^5.7
+        - PHP_SYNTAX=1
+    - php: 7.1
+      env:
+        - PHP_CS=1
+    - php: 7.1
+      env:
+        - PHP_CPD=1
     - php: 7.1
       env:
-        - PHPCS=1
+        - PHP_MD=1
     - php: 7.1
       env:
-        - FOC_VALIDATE=1
-  exclude:
-    - php: 7.2
-      env: CAKE_VERSION=2.9
+        - PHP_STAN=1
+    - php: 7.1
+      env:
+        - PHP_PHAN=1
+    - php: 7.1
+      env:
+        - PHP_COVERAGE=1
 
 branches:
   only:
     - master
+    - 2.x
+    - 3.x
 
 before_script:
-  - git clone -b master https://github.com/Oefenweb/travis --depth 1 ../travis
-  - travis_wait ../travis/before_script.sh
+  - travis_wait ./.travis/before-script.sh
+  - mysql -u root -e 'CREATE DATABASE cakephp_test;'
 
 script:
-  - ../travis/script.sh
+  - ./.travis/script.sh
 
 after_success:
-  - ../travis/after_success.sh
-
-notifications:
-  email: false
-  hipchat:
-    rooms:
-      secure: bTreDxMYliZtwL5N4MjGrf7Zfu/Wi934vFgtZ2TNxoV3ZRWmoSqoWI7TW/SmMYgnSVHEifPutYFA6H6jKMzNaEyqiH8Fq/7ZIVuRb9pfGyXj8+qGBfXyGnPUnqz+ra2j1AewCjfxAJtx7yNi2LBm7eDze8g5j/g0EblkQP7LkzY=
+  - ./.travis/after-success.sh

.travis.yml

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# set -x;
+set -e;
+set -o pipefail;
+#
+# thisFile="$(readlink -f "${0}")";
+# thisFilePath="$(dirname "${thisFile}")";
+#
+if [ "${PHP_COVERAGE}" = '1' ]; then
+    bash <(curl -s https://codecov.io/bash);
+fi
+

.travis/after-success.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+#
+# set -x;
+set -e;
+set -o pipefail;
+#
+# thisFile="$(readlink -f "${0}")";
+# thisFilePath="$(dirname "${thisFile}")";
+#
+composer install --no-ansi --no-progress --no-interaction --optimize-autoloader;
+
+if [ "${PHP_SYNTAX}" = '1' ]; then
+    exit 0;
+elif [ "${PHP_CS}" = '1' ]; then
+    exit 0;
+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;
+

.travis/before-script.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+#
+# set -x;
+set -e;
+set -o pipefail;
+#
+# thisFile="$(readlink -f "${0}")";
+# thisFilePath="$(dirname "${thisFile}")";
+#
+if [ "${PHP_SYNTAX}" = '1' ]; then
+    [ "$(find . \( -path './vendor' \) -prune -o -type f \( -name '*.ctp' -o -name '*.php' \) -print0 | xargs -0 --no-run-if-empty -L1 -i'{}' php -l '{}' | grep -vc 'No syntax errors')" -eq 0 ];
+elif [ "${PHP_CS}" = '1' ]; then
+    excludePaths=( \
+        'vendor/*' \
+    );
+    excludePathsJoined=$(printf ",%s" "${excludePaths[@]}");
+    excludePathsJoined=${excludePathsJoined:1};
+
+    vendor/bin/phpcs \
+        --config-set installed_paths "${PWD}/vendor/cakephp/cakephp-codesniffer,${PWD}/vendor/oefenweb/cakephp-codesniffer" \
+    ;
+    vendor/bin/phpcs . --standard=CakePHPOefenweb --extensions=ctp,php --ignore="${excludePathsJoined}";
+elif [ "${PHP_CPD}" = '1' ]; then
+    vendor/bin/phpcpd . --names '*.php,*.ctp' --exclude vendor --no-interaction --fuzzy .;
+elif [ "${PHP_MD}" = '1' ]; then
+    excludePaths=( \
+        '**/vendor' \
+    );
+    excludePathsJoined=$(printf ",%s" "${excludePaths[@]}");
+    excludePathsJoined=${excludePathsJoined:1};
+
+    vendor/bin/phpmd . text phpmd.xml --suffixes php --exclude "${excludePathsJoined}" || true;
+elif [ "${PHP_STAN}" = '1' ]; then
+	vendor/bin/phpstan analyse -c phpstan.neon -l 5 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
+