From 799a63bff25522bff0f80e25c2a4a5a6b8b52144 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 5 Nov 2019 11:20:19 +0100
Subject: - switch to phpunit7 - Update autoloader generator to include self
PSR-0, PSR-4, files, and classmap
---
php-symfony4.spec | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
(limited to 'php-symfony4.spec')
diff --git a/php-symfony4.spec b/php-symfony4.spec
index d8c6326..af4485d 100644
--- a/php-symfony4.spec
+++ b/php-symfony4.spec
@@ -118,7 +118,7 @@
Name: php-%{composer_project}4
Version: %{github_version}
-Release: 1%{?github_prerelease:.%{github_prerelease}}%{?dist}
+Release: 2%{?github_prerelease:.%{github_prerelease}}%{?dist}
Summary: Symfony PHP framework (version 4)
# MIT and CC-BY-SA:
@@ -171,7 +171,7 @@ BuildRequires: php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver}
BuildRequires: php-composer(phpdocumentor/reflection-docblock) < %{phpdocumentor_reflection_docblock_max_ver}
BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver}
BuildConflicts: php-composer(phpdocumentor/reflection-docblock) = 3.2.0
-BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: phpunit7
BuildRequires: php-composer(psr/cache) < %{psr_cache_max_ver}
BuildRequires: php-composer(psr/cache) >= %{psr_cache_min_ver}
BuildRequires: php-composer(psr/container) < %{psr_container_max_ver}
@@ -220,7 +220,7 @@ BuildRequires: php-tokenizer
BuildRequires: php-xml
BuildRequires: php-xmlreader
## Autoloader
-BuildRequires: php-composer(fedora/autoloader)
+BuildRequires: php-fedora-autoloader-devel
# Conflicts
BuildConflicts: php-composer(phpdocumentor/type-resolver) < 0.3.0
@@ -228,10 +228,7 @@ BuildConflicts: php-composer(phpdocumentor/type-resolver) < 0.3.0
Requires: php-composer(%{composer_vendor}/doctrine-bridge) = %{version}
Requires: php-composer(%{composer_vendor}/monolog-bridge) = %{version}
#Requires: php-composer(%%{composer_vendor}/phpunit-bridge) = %%{version}
-%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
-# this requires ZF and thus PHP 7
Requires: php-composer(%{composer_vendor}/proxy-manager-bridge) = %{version}
-%endif
Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
# Bundles
Requires: php-composer(%{composer_vendor}/debug-bundle) = %{version}
@@ -1957,10 +1954,6 @@ if (!defined('FEDORA_SYMFONY4_DIR')) {
define('FEDORA_SYMFONY4_DIR', __DIR__);
}
-\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Bridge\\', FEDORA_SYMFONY4_DIR.'/Bridge', true);
-\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Bundle\\', FEDORA_SYMFONY4_DIR.'/Bundle', true);
-\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\', FEDORA_SYMFONY4_DIR.'/Component', true);
-
\Fedora\Autoloader\Dependencies::required([
'%{phpdir}/Composer/autoload.php',
]);
@@ -2080,12 +2073,12 @@ for PKG in %{buildroot}%{symfony4_dir}/*/*; do
cat << BOOTSTRAP | tee bootstrap.php
<?php
require_once '${PKG}/autoload-dev.php';
-require_once '%{buildroot}%{symfony4_dir}/Bridge/PhpUnit/bootstrap.php';
+require_once '%{buildroot}%{symfony4_dir}/Bridge/PhpUnit/autoload.php';
require_once '%{buildroot}%{symfony4_dir}/vendor/autoload.php';
BOOTSTRAP
%{_bindir}/php -d include_path=.:${PSR0}:%{buildroot}%{phpdir}:%{phpdir} \
- %{_bindir}/phpunit --exclude-group benchmark $PKG || RET=1
+ %{_bindir}/phpunit7 --exclude-group benchmark $PKG || RET=1
fi
done
exit $RET
@@ -2921,6 +2914,12 @@ exit $RET
# ##############################################################################
%changelog
+* Tue Nov 5 2019 Remi Collet <remi@remirepo.net> - 4.2.11-3
+- switch to phpunit7
+
+* Sat Sep 14 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 4.2.11-2
+- Update autoloader generator to include self PSR-0, PSR-4, files, and classmap
+
* Tue Aug 20 2019 Remi Collet <remi@remirepo.net> - 4.2.11-1
- update to 4.2.11
--
cgit