From 5b1de9ff8acf24dff554e0e381961e01ac3628ae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Dec 2018 14:07:12 +0100 Subject: v3.7.0 --- composer-chronos.json | 8 ++++---- composer.json | 6 ++++-- php-cakephp.spec | 35 ++++++++++++++++++++++++++++++----- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/composer-chronos.json b/composer-chronos.json index 77a7e27..6aa3f87 100644 --- a/composer-chronos.json +++ b/composer-chronos.json @@ -29,21 +29,21 @@ "php": "^5.5.9|^7" }, "require-dev": { - "phpunit/phpunit": "<6.0", + "phpunit/phpunit": "<6.0 || ^7.0", "athletic/athletic": "~0.1", - "cakephp/cakephp-codesniffer": "~2.3", + "cakephp/cakephp-codesniffer": "^3.0", "phpbench/phpbench": "@dev", "phpstan/phpstan": "^0.6.4" }, "autoload": { "psr-4": { - "Cake\\Chronos\\": "src" + "Cake\\Chronos\\": "src/" }, "files": ["src/carbon_compat.php"] }, "autoload-dev": { "psr-4": { - "Cake\\Chronos\\Test\\": "tests" + "Cake\\Chronos\\Test\\": "tests/" }, "files": ["tests/TestCase.php"] }, diff --git a/composer.json b/composer.json index 8818ca5..dea0220 100644 --- a/composer.json +++ b/composer.json @@ -34,10 +34,12 @@ "cakephp/chronos": "^1.0.1", "aura/intl": "^3.0.0", "psr/log": "^1.0.0", + "psr/simple-cache": "^1.0.0", "zendframework/zend-diactoros": "^1.4.0" }, "suggest": { "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.", + "ext-curl": "To enable more efficient network calls in Http\\Client.", "lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()" }, "require-dev": { @@ -92,8 +94,8 @@ "@cs-check", "@test" ], - "cs-check": "phpcs --colors -p ./src ./tests", - "cs-fix": "phpcbf --colors ./src ./tests", + "cs-check": "phpcs --colors -p src/ tests/", + "cs-fix": "phpcbf --colors src/ tests/", "test": "phpunit", "test-coverage": "phpunit --coverage-clover=clover.xml" } diff --git a/php-cakephp.spec b/php-cakephp.spec index 235e1a4..5ef785e 100644 --- a/php-cakephp.spec +++ b/php-cakephp.spec @@ -8,7 +8,7 @@ # # https://github.com/cakephp/cakephp/releases -%global gh_commit 6a0b9c74710a56c5974d1c8229c7a91dac780402 +%global gh_commit 56f2d2a69870031cd0527d63a2ddeb3fbe6f05d3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner cakephp %global gh_project cakephp @@ -18,13 +18,12 @@ %global with_tests 0%{!?_without_tests:1} # https://github.com/cakephp/chronos/releases -# NOTICE 1.2.1 breaks the test suite -%global chronos_commit 85bcaea6a832684b32ef54b2487b0c14a172e9e6 +%global chronos_commit 395110125ff577f080fa064dca5c5608a4e77ee1 %global chronos_short %(c=%{chronos_commit}; echo ${c:0:7}) -%global chronos_version 1.1.4 +%global chronos_version 1.2.3 Name: php-%{pk_vendor} -Version: 3.6.13 +Version: 3.7.0 Release: 1%{?dist} Summary: The CakePHP framework @@ -86,6 +85,18 @@ Summary: CakePHP Collection Library # "cakephp/core": "^3.6.0" Requires: php(language) >= 5.6 Requires: php-composer(%{pk_vendor}/core) = %{version} +# from main composer.json +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(psr/simple-cache) >= 1.0.0 with php-composer(psr/simple-cache) < 2) +Requires: (php-composer(psr/simple-cache) >= 1.0.0 with php-composer(psr/simple-cache) < 2) +# Optional (from phpcompatinfo report) +Recommends: php-apcu +Suggests: php-memcached +Suggests: php-redis +%else +BuildRequires: php-psr-simple-cache >= 1.0.0 +Requires: php-psr-simple-cache >= 1.0.0 +%endif # From phpcompatinfo report Requires: php-date Requires: php-pcre @@ -259,12 +270,14 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('ParentPlugin\\', dirname(__DIR__).'/tests/test_app/Plugin/ParentPlugin/src'); \Fedora\Autoloader\Autoload::addPsr4('PluginJs\\', dirname(__DIR__).'/tests/test_app/Plugin/PluginJs/src'); \Fedora\Autoloader\Dependencies::required([ + dirname(__DIR__).'/src/Chronos/carbon_compat.php', dirname(__DIR__).'/src/Core/functions.php', dirname(__DIR__).'/src/Collection/functions.php', dirname(__DIR__).'/src/I18n/functions.php', dirname(__DIR__).'/src/Utility/bootstrap.php', '%{php_home}/Aura/Intl/autoload.php', '%{php_home}/Psr/Log/autoload.php', + '%{php_home}/Psr/SimpleCache/autoload.php', '%{php_home}/Zend/Diactoros/autoload.php', ]); EOF @@ -277,6 +290,7 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Cake\\Cache\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ dirname(__DIR__) . '/Core/autoload.php', + '%{php_home}/Psr/SimpleCache/autoload.php', ]); EOF @@ -403,14 +417,17 @@ exit $ret %doc src/Cache/composer.json %doc src/Cache/*md %{php_home}/%{ns_vendor}/Cache +%exclude %{php_home}/%{ns_vendor}/Cache/*.md %files collection + %{!?_licensedir:%global license %%doc} %license src/Collection/LICENSE.txt %doc src/Collection/composer.json %doc src/Collection/*md %dir %{php_home}/%{ns_vendor} %{php_home}/%{ns_vendor}/Collection +%exclude %{php_home}/%{ns_vendor}/Collection/*.md %files core %{!?_licensedir:%global license %%doc} @@ -419,6 +436,7 @@ exit $ret %doc src/Core/*md %dir %{php_home}/%{ns_vendor} %{php_home}/%{ns_vendor}/Core +%exclude %{php_home}/%{ns_vendor}/Core/*.md %files database %{!?_licensedir:%global license %%doc} @@ -426,6 +444,7 @@ exit $ret %doc src/Database/composer.json %doc src/Database/*md %{php_home}/%{ns_vendor}/Database +%exclude %{php_home}/%{ns_vendor}/Database/*.md %files datasource %{!?_licensedir:%global license %%doc} @@ -433,6 +452,7 @@ exit $ret %doc src/Datasource/composer.json %doc src/Datasource/*md %{php_home}/%{ns_vendor}/Datasource +%exclude %{php_home}/%{ns_vendor}/Datasource/*.md %files utility %{!?_licensedir:%global license %%doc} @@ -440,9 +460,14 @@ exit $ret %doc src/Utility/composer.json %doc src/Utility/*md %{php_home}/%{ns_vendor}/Utility +%exclude %{php_home}/%{ns_vendor}/Utility/*.md %changelog +* Thu Dec 13 2018 Remi Collet - 3.7.0-1 +- update to 3.7.0 +- use Chronos 1.2.3 + * Mon Nov 5 2018 Remi Collet - 3.6.16-1 - update to 3.6.16 -- cgit