update to 1.5.0

switch to classmap autoloader

2 files changed, 51 insertions, 39 deletions

diff --git a/composer.json b/composer.json
index 0cf4ba8..694aced 100644
--- a/composer.json
+++ b/composer.json
@@ -21,22 +21,23 @@
   "require": {
     "php": ">=5.4",
     "ext-zlib": "*",
-    "tecnickcom/tc-lib-color": "^1.12.15",
-    "tecnickcom/tc-lib-pdf-encrypt": "^1.5.10"
+    "tecnickcom/tc-lib-color": "^1.14",
+    "tecnickcom/tc-lib-pdf-encrypt": "^1.6.0"
   },
   "require-dev": {
-    "apigen/apigen": "^4.1.2",
-    "bartlett/php-compatinfo": "^5.0.10 || ^5.0.12",
-    "pdepend/pdepend": "^2.5.2",
-    "phploc/phploc": "^2.1 || ^3.0 || ^4.0",
-    "phpmd/phpmd": "^2.6.0",
-    "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.1",
-    "sebastian/phpcpd": "^2.0 || ^3.0 || ^4.0",
-    "squizlabs/php_codesniffer": "^2.8.0 || ^3.2.0"
+    "pdepend/pdepend": "2.8.0",
+    "phploc/phploc": "7.0.2 || 6.0.2 || 5.0.0 || 4.0.1 || 3.0.1 || 2.1.5",
+    "phpmd/phpmd": "2.9.1",
+    "phpunit/phpunit": "9.5.0 || 8.5.13 || 7.5.20 || 6.5.14 || 5.7.27 || 4.8.36",
+    "sebastian/phpcpd": "6.0.3 || 5.0.2 || 4.1.0 || 3.0.1 || 2.0.4",
+    "squizlabs/php_codesniffer": "3.5.8 || 2.9.2"
   },
   "autoload": {
     "psr-4": {
       "Com\\Tecnick\\Pdf\\Graph\\": "src"
     }
+  },
+  "autoload-dev": {
+    "psr-4": { "Test\\": "test" }
   }
 }
diff --git a/php-tecnickcom-tc-lib-pdf-graph.spec b/php-tecnickcom-tc-lib-pdf-graph.spec
index 7319f77..f78c8cb 100644
--- a/php-tecnickcom-tc-lib-pdf-graph.spec
+++ b/php-tecnickcom-tc-lib-pdf-graph.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    cf86c3a6298f832f340fb7db1a22b67bb0c5d5c8
+%global gh_commit    441f24caf8d06171a54b92f05430fc68abe317a7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global c_vendor     tecnickcom
 %global gh_owner     tecnickcom
@@ -15,7 +15,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        1.4.11
+Version:        1.5.0
 Release:        1%{?dist}
 Summary:        PHP library containing PDF graphic and geometric methods
 
@@ -26,42 +26,45 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 BuildArch:      noarch
 %if %{with_tests}
 # For tests
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-%global phpunit %{_bindir}/phpunit7
+%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+%global phpunit %{_bindir}/phpunit9
+BuildRequires:  phpunit9 >= 9.5.0
 %else
-%global phpunit %{_bindir}/phpunit
+%global phpunit %{_bindir}/phpunit8
+BuildRequires:  phpunit8 >= 8.5.13
 %endif
-BuildRequires:  %{phpunit}
 BuildRequires:  php(language) >= 5.4
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(%{c_vendor}/tc-lib-color)       >= 1.12.13 with php-composer(%{c_vendor}/tc-lib-color)       < 2)
-BuildRequires: (php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.8   with php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 2)
+BuildRequires: (php-composer(%{c_vendor}/tc-lib-color)       >= 1.14    with php-composer(%{c_vendor}/tc-lib-color)       < 2)
+BuildRequires: (php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.6     with php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 2)
 %else
-BuildRequires:  php-composer(%{c_vendor}/tc-lib-color)       <  2
-BuildRequires:  php-composer(%{c_vendor}/tc-lib-color)       >= 1.12.13
-BuildRequires:  php-composer(%{c_vendor}/tc-lib-pdf-encrypt) <  2
-BuildRequires:  php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.8
+BuildRequires:  php-%{c_vendor}-tc-lib-color                 <  2
+BuildRequires:  php-%{c_vendor}-tc-lib-color                 >= 1.14
+BuildRequires:  php-%{c_vendor}-tc-lib-pdf-encrypt           <  2
+BuildRequires:  php-%{c_vendor}-tc-lib-pdf-encrypt           >= 1.6
 %endif
 %endif
+BuildRequires:  php-fedora-autoloader-devel
 
 # From composer.json, "require": {
-#        "php": ">=5.4"
-#        "ext-zlib": "*",
-#        "tecnickcom/tc-lib-color": "^1.12.13",
-#        "tecnickcom/tc-lib-pdf-encrypt": "^1.5.8"
+#    "php": ">=5.4"
+#    "ext-zlib": "*",
+#    "tecnickcom/tc-lib-color": "^1.14",
+#    "tecnickcom/tc-lib-pdf-encrypt": "^1.6.0"
 Requires:       php(language) >= 5.4
 Requires:       php-zlib
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(%{c_vendor}/tc-lib-color)       >= 1.12.13 with php-composer(%{c_vendor}/tc-lib-color)       < 2)
-Requires:      (php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.8   with php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 2)
+Requires:      (php-composer(%{c_vendor}/tc-lib-color)       >= 1.14    with php-composer(%{c_vendor}/tc-lib-color)       < 2)
+Requires:      (php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.6     with php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 2)
 %else
-Requires:       php-composer(%{c_vendor}/tc-lib-color)       <  2
-Requires:       php-composer(%{c_vendor}/tc-lib-color)       >= 1.12.13
-Requires:       php-composer(%{c_vendor}/tc-lib-pdf-encrypt) <  2
-Requires:       php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.8
+Requires:       php-%{c_vendor}-tc-lib-color                 <  2
+Requires:       php-%{c_vendor}-tc-lib-color                 >= 1.14
+Requires:       php-%{c_vendor}-tc-lib-pdf-encrypt)          <  2
+Requires:       php-%{c_vendor}-tc-lib-pdf-encrypt)          >= 1.6
 %endif
 # From phpcompatinfo report for version 1.4.2
 # none
+Requires:       php-composer(fedora/autoloader)
 
 # Composer
 Provides:       php-composer(%{c_vendor}/%{gh_project}) = %{version}
@@ -83,30 +86,34 @@ grep -q '^%{version}$' VERSION
 
 
 %build
-# Empty build section, most likely nothing required.
+phpab --template fedora --output src/autoload.php src
+cat << 'EOF' | tee -a src/autoload.php
+\Fedora\Autoloader\Dependencies::required([
+    '%{_datadir}/php/Com/Tecnick/Color/autoload.php',
+    '%{_datadir}/php/Com/Tecnick/Pdf/Encrypt/autoload.php',
+]);
+EOF
 
 
 %install
 mkdir -p   $(dirname %{buildroot}%{php_project})
 cp -pr src %{buildroot}%{php_project}
-cp -p  resources/autoload.php \
-           %{buildroot}%{php_project}/autoload.php
 
 
 %check
 %if %{with_tests}
 mkdir vendor
-cat <<EOF | tee vendor/autoload.php
+cat << 'EOF' | tee vendor/autoload.php
 <?php
 require '%{buildroot}%{php_project}/autoload.php';
-require '%{php_project}/../../Color/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('Test\\', dirname(__DIR__) . '/test');
 EOF
 
 ret=0
-for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" php71 php72 php73 php74; do
+for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do
    if which $cmdarg; then
       set $cmdarg
-      $1 ${2:-%{_bindir}/phpunit7} --no-coverage --verbose || ret=1
+      $1 ${2:-%{_bindir}/phpunit9} --no-coverage --verbose || ret=1
    fi
 done
 exit $ret
@@ -125,6 +132,10 @@ exit $ret
 
 
 %changelog
+* Mon Dec 21 2020 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 1.5.0
+- switch to classmap autoloader
+
 * Fri Jan  3 2020 Remi Collet <remi@remirepo.net> - 1.4.11-1
 - update to 1.4.11 (no change)