From 5327822544ce568f12c846993cc617d4beb51a11 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Nov 2016 13:00:55 +0100 Subject: php-akamai-open-edgegrid-client: 0.6.0 (backported from Fedora) --- composer.json | 19 ++++--- php-akamai-open-edgegrid-client.spec | 98 +++++++++++++++++------------------- 2 files changed, 59 insertions(+), 58 deletions(-) diff --git a/composer.json b/composer.json index 42ef61c..14c523b 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,10 @@ { "name": "akamai-open/edgegrid-client", "description": "Implements the Akamai {OPEN} EdgeGrid Authentication specified by https://developer.akamai.com/introduction/Client_Auth.html", - "keywords": ["akamai", "open", "edgegrid"], + "keywords": ["akamai", "open", "edgegrid", "authentication", "client"], "type": "library", "license": "Apache-2.0", - "homepage": "https://github.com/akamai-open/edgegrid-auth-php", + "homepage": "https://github.com/akamai-open/AkamaiOPEN-edgegrid-php", "authors": [ { "name": "Davey Shafik", @@ -13,18 +13,18 @@ ], "require": { "php": ">=5.5", + "akamai-open/edgegrid-auth": "^0.6.0", "guzzlehttp/guzzle": "~6.0", "psr/log": "^1.0", "monolog/monolog": "^1.15", - "League/CLImate": "~3.2" + "league/climate": "~3.2" }, "require-dev": { "phpunit/phpunit": "~4.7", - "theseer/phpdox": "~0.8", - "phploc/phploc": "^2.1", "squizlabs/php_codesniffer": "^2.3", "friendsofphp/php-cs-fixer": "^1.9", - "kherge/box": "^2.5" + "kherge/box": "^2.5", + "apigen/apigen": "^4.1" }, "autoload": { "psr-4": { @@ -34,9 +34,14 @@ }, "autoload-dev": { "psr-4": { - "Akamai\\Open\\EdgeGrid\\Tests\\": "tests", + "Akamai\\Open\\EdgeGrid\\Tests\\": ["tests", "vendor/akamai-open/edgegrid-auth/tests"], "GuzzleHttp\\Tests\\": "vendor/guzzlehttp/guzzle/tests", "Monolog\\": "tests/Monolog" } + }, + "config": { + "platform": { + "php": "5.5" + } } } diff --git a/php-akamai-open-edgegrid-client.spec b/php-akamai-open-edgegrid-client.spec index a0fb39a..dba3109 100644 --- a/php-akamai-open-edgegrid-client.spec +++ b/php-akamai-open-edgegrid-client.spec @@ -11,15 +11,18 @@ # %global github_owner akamai-open -%global github_name AkamaiOPEN-edgegrid-php -%global github_version 0.5.0 -%global github_commit 6afbda43ade9dcb6e0335352aeedb51401464d96 +%global github_name AkamaiOPEN-edgegrid-php-client +%global github_version 0.6.0 +%global github_commit 5f95fab43301f54b6928341686d5f2ca273e996e %global composer_vendor akamai-open %global composer_project edgegrid-client # "php": ">=5.5" %global php_min_ver 5.5 +# "akamai-open/edgegrid-auth": "^0.6.0" +%global akamai_open_edgegrid_auth_min_ver 0.6.0 +%global akamai_open_edgegrid_auth_max_ver 1.0.0 # "guzzlehttp/guzzle": "~6.0" %global guzzle_min_ver 6.0 %global guzzle_max_ver 7.0 @@ -48,58 +51,58 @@ Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{githu BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +# Autoloader +BuildRequires: %{_bindir}/phpab # Library version value and autoloader check BuildRequires: php-cli ## composer.json +BuildRequires: php-composer(akamai-open/edgegrid-auth) >= %{akamai_open_edgegrid_auth_min_ver} BuildRequires: php-composer(guzzlehttp/guzzle) >= %{guzzle_min_ver} -BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} +BuildRequires: php-composer(monolog/monolog) >= %{monolog_min_ver} +BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} # Tests %if %{with_tests} ## composer.json -BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(monolog/monolog) >= %{monolog_min_ver} +BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) -## phpcompatinfo (computed from version 0.5.0) -BuildRequires: php-date -BuildRequires: php-hash +## phpcompatinfo (computed from version 0.6.0) BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-reflection -## Autoloader -BuildRequires: php-composer(symfony/class-loader) %endif # composer.json -Requires: php(language) >= %{php_min_ver} -Requires: php-composer(guzzlehttp/guzzle) >= %{guzzle_min_ver} +Requires: php(language) >= %{php_min_ver} +Requires: php-composer(akamai-open/edgegrid-auth) < %{akamai_open_edgegrid_auth_max_ver} +Requires: php-composer(akamai-open/edgegrid-auth) >= %{akamai_open_edgegrid_auth_min_ver} Requires: php-composer(guzzlehttp/guzzle) < %{guzzle_max_ver} -Requires: php-composer(monolog/monolog) >= %{monolog_min_ver} -Requires: php-composer(monolog/monolog) < %{monolog_max_ver} -Requires: php-composer(psr/log) >= %{psr_log_min_ver} -Requires: php-composer(psr/log) < %{psr_log_max_ver} -# phpcompatinfo (computed from version 0.5.0) -Requires: php-date -Requires: php-hash +Requires: php-composer(guzzlehttp/guzzle) >= %{guzzle_min_ver} +Requires: php-composer(monolog/monolog) < %{monolog_max_ver} +Requires: php-composer(monolog/monolog) >= %{monolog_min_ver} +Requires: php-composer(psr/log) < %{psr_log_max_ver} +Requires: php-composer(psr/log) >= %{psr_log_min_ver} +# phpcompatinfo (computed from version 0.6.0) Requires: php-json Requires: php-pcre -# Autoloader -Requires: php-composer(symfony/class-loader) # Composer Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} %description -Akamai {OPEN} EdgeGrid Authentication [1] for PHP +Akamai {OPEN} EdgeGrid Authentication [1] Client for PHP This library implements the Akamai {OPEN} EdgeGrid Authentication scheme on top -of Guzzle, as both a drop-in replacement client, and middleware. +of Guzzle [2], as both a drop-in replacement client, and middleware. -For more information visit the Akamai {OPEN} Developer Community [2]. +For more information visit the Akamai {OPEN} Developer Community [3]. -Autoloader: %{phpdir}/Akamai/Open/EdgeGrid/autoload.php +Autoloader: %{phpdir}/Akamai/Open/EdgeGrid/autoload-client.php +(Note: Compat autoloader %{phpdir}/Akamai/Open/EdgeGrid/autoload.php +will be removed in version 1.0.0) [1] https://developer.akamai.com/introduction/Client_Auth.html -[2] https://developer.akamai.com/ +[2] https://github.com/guzzle/guzzle +[3] https://developer.akamai.com/ %prep @@ -110,34 +113,20 @@ rm -f src/Cli.php %build : Create autoloader -cat <<'AUTOLOAD' | tee src/autoload.php -register(); -} - -$fedoraClassLoader->addPrefix('Akamai\\Open\\EdgeGrid\\', dirname(dirname(dirname(__DIR__)))); +cat <<'AUTOLOAD' | tee -a src/autoload-client.php // Required dependencies +require_once '%{phpdir}/Akamai/Open/EdgeGrid/autoload-auth.php'; require_once '%{phpdir}/GuzzleHttp6/autoload.php'; require_once '%{phpdir}/Monolog/autoload.php'; require_once '%{phpdir}/Psr/Log/autoload.php'; - -return $fedoraClassLoader; AUTOLOAD +: Compat autoloader +ln -s autoload-client.php src/autoload.php + %install rm -rf %{buildroot} @@ -163,7 +152,7 @@ ln -s ../../../../tests tests-psr0/Akamai/Open/EdgeGrid/Tests : Create tests bootstrap cat <<'BOOTSTRAP' | tee bootstrap.php addPrefix( 'Akamai\\Open\\EdgeGrid\\Tests\\', @@ -200,12 +189,19 @@ rm -rf %{buildroot} %license LICENSE %doc *.md %doc composer.json -%dir %{phpdir}/Akamai -%dir %{phpdir}/Akamai/Open - %{phpdir}/Akamai/Open/EdgeGrid +%{phpdir}/Akamai/Open/EdgeGrid/autoload-client.php +%{phpdir}/Akamai/Open/EdgeGrid/autoload.php +%{phpdir}/Akamai/Open/EdgeGrid/Client.php +%{phpdir}/Akamai/Open/EdgeGrid/Exception +%{phpdir}/Akamai/Open/EdgeGrid/Exception.php +%{phpdir}/Akamai/Open/EdgeGrid/Handler %changelog +* Wed Nov 02 2016 Shawn Iwinski - 0.6.0-1 +- Updated to 0.6.0 (RHBZ #1382986) +- Autoloader changed from Symfony ClassLoader to phpab classmap + * Sun Sep 25 2016 Shawn Iwinski - 0.5.0-1 - Updated to 0.5.0 (RHBZ #1376273) -- cgit