Merge branch 'GRINTEGRAT-5406-prestashop-plugin-podbicie-php-do-wersji-7-2' into 'master'

[GRINTEGRAT-5406] Podbicie PHP do wersji 7.2, PhpStan, commit hooks

See merge request integrations/prestashop/getresponse-for-prestashop!57

Author: Radosław Karkut

.gitlab-ci.yml

@@ -17,8 +17,8 @@ workflow:
   rules:
     - if: $CI_COMMIT_BRANCH != "master"
 
-composer install:php71:
-  image: php:7.1-cli
+composer install:php72:
+  image: php:7.2-cli
   stage: install_dependencies
   before_script:
     - apt-get update
@@ -34,16 +34,16 @@ composer install:php71:
     expire_in: 2 hrs
   <<: *exclude-master
 
-test:app-php71:
-  image: php:7.1-cli
+test:app-php72:
+  image: php:7.2-cli
   stage: test
   tags:
     - hq1-small-amd64
   script:
     - ./vendor/bin/phpunit --testsuite unit --configuration ./tests/phpunit.xml --colors=never
   <<: *exclude-master
   dependencies:
-    - composer install:php71
+    - composer install:php72
 
 upload to s3:
   stage: upload_to_s3

.php-cs-fixer.dist.php

@@ -0,0 +1,9 @@
+<?php
+
+$config = new PrestaShop\CodingStandards\CsFixer\Config();
+
+/** @var \Symfony\Component\Finder\Finder $finder */
+$finder = $config->setUsingCache(true)->getFinder();
+$finder->in(__DIR__)->exclude('vendor');
+
+return $config;

.php_cs.dist

@@ -1,22 +1,4 @@
-FROM php:5.6-cli as php5
-RUN mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
-RUN pecl channel-update pecl.php.net
-RUN pecl install http://pecl.php.net/get/xdebug-2.5.5.tgz \
-    && docker-php-ext-enable xdebug
-WORKDIR /plugin
-COPY --from=docker.int.getresponse.com/docker/composer:2.2.9 /usr/bin/composer /usr/bin/composer
-COPY . ./
-RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \
-           -e 's|security.debian.org|archive.debian.org/|g' \
-           -e '/stretch-updates/d' /etc/apt/sources.list
-RUN apt-get update \
-    && apt-get upgrade -y \
-    && apt-get install -y \
-        unzip
-RUN composer update --no-interaction --prefer-dist --no-suggest --no-cache
-ENTRYPOINT [ "/bin/bash", "-c", "tail -f /dev/null" ]
-
-FROM php:7.1-cli as php7
+FROM php:7.2-cli as php7
 RUN mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 RUN pecl channel-update pecl.php.net
 RUN pecl install http://pecl.php.net/get/xdebug-2.9.0.tgz \

Dockerfile

@@ -3,19 +3,12 @@
 help:  ## Display this help
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_\-0-9]+:.*?##/ { printf "  \033[36m%-22s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
-app-php56-dev-build: ## Create environment with php5.6
-	docker compose up -d php56
-	docker compose exec php56 composer update
+app-php72-dev-build: ## Create environment with php7.2 for unit tests
+	docker compose up -d php72
+	docker compose exec php72 composer update
 
-app-php71-dev-build: ## Create environment with php7.1 for unit tests
-	docker compose up -d php71
-	docker compose exec php71 composer update
-
-run-tests-php56: app-php56-dev-build ## Runs unit tests with php5.6
-	docker compose exec php56 vendor/bin/phpunit --configuration tests/phpunit.xml
-
-run-tests-php71: app-php71-dev-build ## Runs unit tests with php7.1
-	docker compose exec php71 vendor/bin/phpunit --configuration tests/phpunit.xml
+run-tests-php72: app-php72-dev-build ## Runs unit tests with php7.2
+	docker compose exec php72 vendor/bin/phpunit --configuration tests/phpunit.xml
 
 deploy-to-github: ## Creates new release in github from gitlab tags
 	sh deploy.sh

Makefile

@@ -0,0 +1,52 @@
+{
+    "config": {
+        "run-mode": "docker",
+        "run-exec": "docker exec -w /project/prestashop/modules/grprestashop prestashop-app-17",
+        "path": "/vendor/bin/captainhook",
+        "git": "/.git"
+    },
+    "commit-msg": {
+        "enabled": false,
+        "actions": []
+    },
+    "pre-push": {
+        "enabled": false,
+        "actions": []
+    },
+  "pre-commit": {
+
+    "enabled": true,
+    "actions": [
+      {
+        "action": "composer run-script php-cs-fix"
+      },
+      {
+        "action": "composer run-script phpstan"
+      }
+    ]
+  },
+    "prepare-commit-msg": {
+        "enabled": false,
+        "actions": []
+    },
+    "post-commit": {
+        "enabled": false,
+        "actions": []
+    },
+    "post-merge": {
+        "enabled": false,
+        "actions": []
+    },
+    "post-checkout": {
+        "enabled": false,
+        "actions": []
+    },
+    "post-rewrite": {
+        "enabled": false,
+        "actions": []
+    },
+    "post-change": {
+        "enabled": false,
+        "actions": []
+    }
+}

captainhook.json

@@ -192,7 +192,7 @@ private function getPluginDetails()
 
         return json_encode(
             [
-                'plugin_version' => '1.5.0',
+                'plugin_version' => '2.0.0',
                 'prestashop_version' => _PS_VERSION_,
                 'php_version' => phpversion(),
                 'shops' => $shops,

classes/WebserviceSpecificManagementGetresponseModule.php

@@ -16,13 +16,17 @@
     "type": "prestashop-module",
     "minimum-stability": "stable",
     "require": {
-        "php": ">= 5.6",
+        "php": ">= 7.2",
         "beberlei/assert": "2.*"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0",
-        "prestashop/php-dev-tools": "^3.16",
-        "phpstan/phpstan": "0.12.40"
+        "prestashop/php-dev-tools": "^5.0",
+        "friendsofphp/php-cs-fixer": "^3.4",
+        "captainhook/captainhook": "^5.14",
+        "phpstan/phpstan": "^1.12",
+        "prestashop/autoindex": "^2.1",
+        "prestashop/header-stamp": "^2.6"
     },
     "autoload": {
         "psr-4": {
@@ -39,9 +43,12 @@
     "scripts": {
         "run-fixers": [
             "php vendor/bin/php-cs-fixer fix",
+            "_PS_ROOT_DIR_=../../ vendor/bin/phpstan analyse --configuration=tests/phpstan/phpstan.neon --memory-limit=256M",
             "vendor/bin/autoindex",
             "vendor/bin/header-stamp --license=assets/afl.txt --exclude=vendor"
         ],
+        "phpstan": "_PS_ROOT_DIR_=../../ vendor/bin/phpstan analyse --configuration=tests/phpstan/phpstan.neon --memory-limit=256M",
+        "php-cs-fix": "php vendor/bin/php-cs-fixer fix",
         "tests": "vendor/bin/phpunit --configuration tests/phpunit.xml"
     }
-}
+}