diff options
| author | Remi Collet <remi@remirepo.net> | 2019-12-03 13:41:26 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-12-03 13:41:26 +0100 |
| commit | e175bec87e4952d0af3873e35db751c492df3ce6 (patch) | |
| tree | 92748dcaf42d8272bbaeee6d9cebcf056afc8271 | |
| parent | 21b4eba49b2ab302ccf56d67facbb86325fe56b2 (diff) | |
use Chronos 1.3.0
| -rw-r--r-- | composer-chronos.json | 8 | ||||
| -rw-r--r-- | php-cakephp.spec | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/composer-chronos.json b/composer-chronos.json index 6aa3f87..d63b284 100644 --- a/composer-chronos.json +++ b/composer-chronos.json @@ -26,14 +26,13 @@ "source": "https://github.com/cakephp/chronos" }, "require": { - "php": "^5.5.9|^7" + "php": ">=5.6" }, "require-dev": { "phpunit/phpunit": "<6.0 || ^7.0", "athletic/athletic": "~0.1", "cakephp/cakephp-codesniffer": "^3.0", - "phpbench/phpbench": "@dev", - "phpstan/phpstan": "^0.6.4" + "phpbench/phpbench": "@dev" }, "autoload": { "psr-4": { @@ -57,6 +56,7 @@ "cs-check": "phpcs", "cs-fix": "phpcbf", "bench": "phpbench run", - "phpstan": "phpstan analyze -c phpstan.neon -l 3 src tests" + "phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 && mv composer.backup composer.json", + "phpstan": "phpstan analyze -c phpstan.neon -l 3 src/" } } diff --git a/php-cakephp.spec b/php-cakephp.spec index 6a9ae49..2779fbb 100644 --- a/php-cakephp.spec +++ b/php-cakephp.spec @@ -18,13 +18,13 @@ %global with_tests 0%{!?_without_tests:1} # https://github.com/cakephp/chronos/releases -%global chronos_commit 0292f06e8cc23fc82f0574889da2d8bf27b613c1 +%global chronos_commit ba2bab98849e7bf29b02dd634ada49ab36472959 %global chronos_short %(c=%{chronos_commit}; echo ${c:0:7}) -%global chronos_version 1.2.8 +%global chronos_version 1.3.0 Name: php-%{pk_vendor} Version: 3.8.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The CakePHP framework License: MIT @@ -582,6 +582,9 @@ exit $ret %changelog +* Tue Dec 3 2019 Remi Collet <remi@remirepo.net> - 3.8.6-2 +- use Chronos 1.3.0 + * Thu Nov 7 2019 Remi Collet <remi@remirepo.net> - 3.8.6-1 - update to 3.8.6 |