From f803a09077907ef715a460a569d47133c24f9171 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Thu, 17 Dec 2020 21:58:52 +0200 Subject: [PATCH 01/16] Update deployer to newer version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9d9d60c..4f65fa3 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "deployer/dist": "^6.0" + "deployer/deployer": "^6.8" }, "require-dev": { "phpro/grumphp": "^0.14.0", From d0af169a10504abddc0e384e3de10ac560ce5433 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Thu, 17 Dec 2020 22:21:43 +0200 Subject: [PATCH 02/16] Update travis instances. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 845991b..313d419 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: php php: - - 7.0 - - 7.1 - - 7.2 + - 7.3 + - 7.4 + - 8.0 before_install: - sudo apt-get -qq update From 2293a42e3b249de598aa6b4769c723317eeaf9d1 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Thu, 17 Dec 2020 22:35:11 +0200 Subject: [PATCH 03/16] Fixing Travis build --- .travis.yml | 3 +++ composer.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 313d419..0d1f1f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ language: php php: + - 7.0 + - 7.1 + - 7.2 - 7.3 - 7.4 - 8.0 diff --git a/composer.json b/composer.json index 4f65fa3..46da18a 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "deployer/deployer": "^6.8" }, "require-dev": { - "phpro/grumphp": "^0.14.0", + "phpro/grumphp": "^1.3.0", "phpmd/phpmd": "^2.6", "nikic/php-parser": "^3.1", "squizlabs/php_codesniffer": "^3.2", From 7345f69cbdbfa9637b7cbce683f47302b5beead3 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Thu, 17 Dec 2020 23:48:20 +0200 Subject: [PATCH 04/16] Fixing Travis build --- grumphp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grumphp.yml b/grumphp.yml index 6955bec..d8c5f65 100644 --- a/grumphp.yml +++ b/grumphp.yml @@ -1,4 +1,4 @@ -parameters: +grumphp: bin_dir: ./vendor/bin git_dir: . stop_on_failure: false From c2b5783f68bd20763dc89086d88fb11b8a123395 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Fri, 18 Dec 2020 00:07:27 +0200 Subject: [PATCH 05/16] Fixing Travis build --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 46da18a..856a641 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "deployer/deployer": "^6.8" }, "require-dev": { - "phpro/grumphp": "^1.3.0", + "phpro/grumphp": "^0.18.0", "phpmd/phpmd": "^2.6", "nikic/php-parser": "^3.1", "squizlabs/php_codesniffer": "^3.2", From 7683cb38c9893b3ca79b09d1be1a6d20d64781e0 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Fri, 18 Dec 2020 00:15:25 +0200 Subject: [PATCH 06/16] Fixing Travis build --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 856a641..4f65fa3 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "deployer/deployer": "^6.8" }, "require-dev": { - "phpro/grumphp": "^0.18.0", + "phpro/grumphp": "^0.14.0", "phpmd/phpmd": "^2.6", "nikic/php-parser": "^3.1", "squizlabs/php_codesniffer": "^3.2", From 008bf6c7ed92c77ed41490ead59127044f7544d4 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Fri, 18 Dec 2020 00:18:39 +0200 Subject: [PATCH 07/16] Fixing Travis build --- .travis.yml | 4 ---- composer.json | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d1f1f9..c196c3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,8 @@ language: php php: - - 7.0 - - 7.1 - - 7.2 - 7.3 - 7.4 - - 8.0 before_install: - sudo apt-get -qq update diff --git a/composer.json b/composer.json index 4f65fa3..1551ef5 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ } ], "require": { + "php": "~7.3.0||~7.4.0", "deployer/deployer": "^6.8" }, "require-dev": { From 6331c2880cd9d8dbbab3bae1a6bf762f3b750f68 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Fri, 18 Dec 2020 00:26:26 +0200 Subject: [PATCH 08/16] Fixing Travis build --- .travis.yml | 6 +++++- composer.json | 2 +- grumphp.yml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c196c3e..b55bb5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: php php: + - 7.2 - 7.3 - 7.4 @@ -8,7 +9,10 @@ before_install: - sudo apt-get -qq update install: - - composer self-update + - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + - php -r "if (hash_file('sha384', 'composer-setup.php') === '756890a4488ce9024fc62c56153228907f1545c228516cbf63f885e036d37e9a59d27d63f46af1d4d07ee0f76181c7d3') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" + - php composer-setup.php --version=1.10.19 + - php -r "unlink('composer-setup.php');" - composer install script: diff --git a/composer.json b/composer.json index 1551ef5..22c86d1 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "deployer/deployer": "^6.8" }, "require-dev": { - "phpro/grumphp": "^0.14.0", + "phpro/grumphp": "^0.18.0", "phpmd/phpmd": "^2.6", "nikic/php-parser": "^3.1", "squizlabs/php_codesniffer": "^3.2", diff --git a/grumphp.yml b/grumphp.yml index d8c5f65..6955bec 100644 --- a/grumphp.yml +++ b/grumphp.yml @@ -1,4 +1,4 @@ -grumphp: +parameters: bin_dir: ./vendor/bin git_dir: . stop_on_failure: false From 71048389087dd586a34b112cf01a204ec6454650 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Fri, 18 Dec 2020 00:32:58 +0200 Subject: [PATCH 09/16] Fixing Travis build --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 22c86d1..20c25f2 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "php": "~7.3.0||~7.4.0", + "php": "~7.2.0||~7.3.0||~7.4.0", "deployer/deployer": "^6.8" }, "require-dev": { From 276121b5345e7d04c5ce8af434c411e904163342 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Fri, 18 Dec 2020 00:34:36 +0200 Subject: [PATCH 10/16] Fixing Travis build --- .travis.yml | 2 ++ composer.json | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b55bb5a..4d165a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: php php: + - 7.0 + - 7.1 - 7.2 - 7.3 - 7.4 diff --git a/composer.json b/composer.json index 20c25f2..856a641 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,6 @@ } ], "require": { - "php": "~7.2.0||~7.3.0||~7.4.0", "deployer/deployer": "^6.8" }, "require-dev": { From f098d6f8debf547f63f7ec752ff9012c5b2c8349 Mon Sep 17 00:00:00 2001 From: Taras Shabatyn Date: Fri, 18 Dec 2020 00:40:01 +0200 Subject: [PATCH 11/16] Fixing Travis build --- .travis.yml | 2 -- composer.json | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d165a2..b55bb5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: php php: - - 7.0 - - 7.1 - 7.2 - 7.3 - 7.4 diff --git a/composer.json b/composer.json index 856a641..20c25f2 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ } ], "require": { + "php": "~7.2.0||~7.3.0||~7.4.0", "deployer/deployer": "^6.8" }, "require-dev": { From b89fa518ae637d2a1109f3d5b5c15c57fcc968d2 Mon Sep 17 00:00:00 2001 From: Erfan Date: Sun, 2 Oct 2022 14:01:59 +0800 Subject: [PATCH 12/16] Reverted back to using system composer version (Composer 2 works) --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b55bb5a..5591c60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,7 @@ before_install: - sudo apt-get -qq update install: - - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - - php -r "if (hash_file('sha384', 'composer-setup.php') === '756890a4488ce9024fc62c56153228907f1545c228516cbf63f885e036d37e9a59d27d63f46af1d4d07ee0f76181c7d3') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" - - php composer-setup.php --version=1.10.19 - - php -r "unlink('composer-setup.php');" - - composer install + - composer self-update script: - vendor/bin/grumphp run From 6ed92957a13f52f292f0b3bb3d60552afa716180 Mon Sep 17 00:00:00 2001 From: Erfan Date: Sun, 2 Oct 2022 14:03:13 +0800 Subject: [PATCH 13/16] Updated dependencies (deployer, grumphp and phpstan) --- .travis.yml | 1 + composer.json | 13 +++++++++---- grumphp.yml | 19 +------------------ 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5591c60..537fd21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ php: - 7.2 - 7.3 - 7.4 + - 8.1 before_install: - sudo apt-get -qq update diff --git a/composer.json b/composer.json index 20c25f2..bacd580 100644 --- a/composer.json +++ b/composer.json @@ -12,20 +12,25 @@ } ], "require": { - "php": "~7.2.0||~7.3.0||~7.4.0", - "deployer/deployer": "^6.8" + "php": "~7.2.0||~7.3.0||~7.4.0||~8.1.0", + "deployer/deployer": "^7.0" }, "require-dev": { - "phpro/grumphp": "^0.18.0", + "phpro/grumphp": "^0.18.0||^1.13", "phpmd/phpmd": "^2.6", "nikic/php-parser": "^3.1", "squizlabs/php_codesniffer": "^3.2", - "phpstan/phpstan": "^0.9.2", + "phpstan/phpstan": "^0.9.2||^1.8", "friendsofphp/php-cs-fixer": "^2.11" }, "autoload": { "files": [ "autoload.php" ] + }, + "config": { + "allow-plugins": { + "phpro/grumphp": true + } } } diff --git a/grumphp.yml b/grumphp.yml index 6955bec..4bb03a9 100644 --- a/grumphp.yml +++ b/grumphp.yml @@ -1,26 +1,9 @@ -parameters: - bin_dir: ./vendor/bin - git_dir: . +grumphp: stop_on_failure: false hide_circumvention_tip: true ascii: failed: ~ succeeded: ~ - composer: - file: ./composer.json - no_check_all: true - no_check_lock: false - no_check_publish: false - with_dependencies: false - strict: false - git_blacklist: - keywords: - - "die(" - - "var_dump(" - - "exit;" - - "console.log(" - triggered_by: ['php'] - regexp_type: G tasks: phpmd: ruleset: ['phpmd.xml'] From 908485e9b1a4a1ac9fda34212be218aa217e4e3d Mon Sep 17 00:00:00 2001 From: Erfan Date: Sun, 2 Oct 2022 14:17:53 +0800 Subject: [PATCH 14/16] Added back composer install --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 537fd21..b3fcdb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_install: install: - composer self-update + - composer install script: - vendor/bin/grumphp run From e0691c4941abcd74d9b771f394808c155f278fb6 Mon Sep 17 00:00:00 2001 From: Erfan Date: Mon, 3 Oct 2022 15:19:35 +0800 Subject: [PATCH 15/16] Removed PHP 7.2 and 7.3 from CI tests --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3fcdb6..cdd1a97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: php php: - - 7.2 - - 7.3 - 7.4 - 8.1 From 4ff0ef4336f471fddb58c1e755c7c9f3d6179ed3 Mon Sep 17 00:00:00 2001 From: Erfan Date: Mon, 3 Oct 2022 15:37:13 +0800 Subject: [PATCH 16/16] Stopped supporting PHP 7.2 and 7.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bacd580..a9f3cab 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "php": "~7.2.0||~7.3.0||~7.4.0||~8.1.0", + "php": "~7.4.0||~8.1.0", "deployer/deployer": "^7.0" }, "require-dev": {