diff options
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-symfony4-autoload.patch | 17 | ||||
| -rwxr-xr-x | php-symfony4-generate-autoloaders.php | 5 | ||||
| -rw-r--r-- | php-symfony4.spec | 134 |
4 files changed, 121 insertions, 42 deletions
diff --git a/composer.json b/composer.json index b9c0b1d..f861cbc 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^7.1.3", "ext-xml": "*", - "doctrine/common": "~2.4@stable", + "doctrine/common": "~2.4", "fig/link-util": "^1.0", "twig/twig": "^1.35|^2.4.4", "psr/cache": "~1.0", @@ -56,6 +56,7 @@ "symfony/intl": "self.version", "symfony/ldap": "self.version", "symfony/lock": "self.version", + "symfony/messenger": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", @@ -89,7 +90,7 @@ "doctrine/cache": "~1.6", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", - "doctrine/orm": "~2.4,>=2.4.5,<=2.7.0", + "doctrine/orm": "~2.4,>=2.4.5", "doctrine/doctrine-bundle": "~1.4", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0|~2.0", @@ -132,7 +133,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } } } diff --git a/php-symfony4-autoload.patch b/php-symfony4-autoload.patch new file mode 100644 index 0000000..3b56f7d --- /dev/null +++ b/php-symfony4-autoload.patch @@ -0,0 +1,17 @@ +diff -up ./src/Symfony/Component/VarDumper/Resources/bin/var-dump-server.old ./src/Symfony/Component/VarDumper/Resources/bin/var-dump-server +--- ./src/Symfony/Component/VarDumper/Resources/bin/var-dump-server.old 2018-09-04 13:33:05.600027027 +0200 ++++ ./src/Symfony/Component/VarDumper/Resources/bin/var-dump-server 2018-09-04 13:34:32.377481003 +0200 +@@ -31,11 +31,9 @@ function includeIfExists(string $file): + } + + if ( +- !includeIfExists(__DIR__ . '/../../../../autoload.php') && +- !includeIfExists(__DIR__ . '/../../vendor/autoload.php') && +- !includeIfExists(__DIR__ . '/../../../../../../vendor/autoload.php') ++ !includeIfExists('/usr/share/php/Symfony4/autoload.php') + ) { +- fwrite(STDERR, 'Install dependencies using Composer.'.PHP_EOL); ++ fwrite(STDERR, 'Install dependencies.'.PHP_EOL); + exit(1); + } + diff --git a/php-symfony4-generate-autoloaders.php b/php-symfony4-generate-autoloaders.php index 0e1589a..d8823ce 100755 --- a/php-symfony4-generate-autoloaders.php +++ b/php-symfony4-generate-autoloaders.php @@ -203,6 +203,10 @@ final class AutoloadGenerator { 'prefix' => 'FEDORA_SYMFONY4_DIR', 'path' => 'Component/Lock/autoload.php', ], + 'symfony/messenger' => [ + 'prefix' => 'FEDORA_SYMFONY4_DIR', + 'path' => 'Component/Messenger/autoload.php', + ], 'symfony/monolog-bridge' => [ 'prefix' => 'FEDORA_SYMFONY4_DIR', 'path' => 'Component/Monolog/autoload.php', @@ -327,6 +331,7 @@ final class AutoloadGenerator { 'Twig/autoload.php', ], ], + 'enqueue/messenger-adapter' => false, ]; private $filename = null; diff --git a/php-symfony4.spec b/php-symfony4.spec index 6d1213f..fd673e9 100644 --- a/php-symfony4.spec +++ b/php-symfony4.spec @@ -13,8 +13,8 @@ %global github_owner symfony %global github_name symfony -%global github_version 4.0.14 -%global github_commit 2a98d99a2f78a7554bc4ee5a2ade89377fe336e0 +%global github_version 4.1.4 +%global github_commit c3f89b5cc80764558368a8246af02c717a2d81d5 %global composer_vendor symfony %global composer_project symfony @@ -43,9 +43,9 @@ # "doctrine/doctrine-bundle": "~1.4" %global doctrine_bundle_min_ver 1.4 %global doctrine_bundle_max_ver 2.0 -# "doctrine/orm": "~2.4,>=2.4.5,<=2.7.0" +# "doctrine/orm": "~2.4,>=2.4.5" %global doctrine_orm_min_ver 2.4.5 -%global doctrine_orm_max_ver 2.7.0 +%global doctrine_orm_max_ver 3.0 # "egulias/email-validator": "~1.2,>=1.2.8|~2.0" %global email_validator_min_ver 1.2.8 %global email_validator_max_ver 3.0 @@ -118,6 +118,9 @@ URL: http://symfony.com Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz Source1: %{name}-generate-autoloaders.php +# Use our autoloader +Patch0: %{name}-autoload.patch + BuildArch: noarch # Tests BuildRequires: composer @@ -205,7 +208,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 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 # this requires ZF and thus PHP 7 Requires: php-composer(%{composer_vendor}/proxy-manager-bridge) = %{version} %endif @@ -239,6 +242,7 @@ Requires: php-composer(%{composer_vendor}/inflector) = %{version} Requires: php-composer(%{composer_vendor}/intl) = %{version} Requires: php-composer(%{composer_vendor}/ldap) = %{version} Requires: php-composer(%{composer_vendor}/lock) = %{version} +Requires: php-composer(%{composer_vendor}/messenger) = %{version} Requires: php-composer(%{composer_vendor}/options-resolver) = %{version} Requires: php-composer(%{composer_vendor}/process) = %{version} Requires: php-composer(%{composer_vendor}/property-access) = %{version} @@ -293,7 +297,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} Requires: php-composer(doctrine/common) < %{doctrine_common_max_ver} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/form) Suggests: php-composer(%{composer_vendor}/property-info) Suggests: php-composer(%{composer_vendor}/validator) @@ -336,7 +340,7 @@ Requires: php-composer(monolog/monolog) >= %{monolog_min_ver} Requires: php-composer(monolog/monolog) < %{monolog_max_ver} Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/console) Suggests: php-composer(%{composer_vendor}/event-dispatcher) Suggests: php-composer(%{composer_vendor}/var-dumper) @@ -366,7 +370,7 @@ License: MIT Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/debug) Suggests: php-pecl(zip) %endif @@ -428,7 +432,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: php-composer(twig/twig) >= %{twig_min_ver} Requires: php-composer(twig/twig) < %{twig_max_ver} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/asset) Suggests: php-composer(%{composer_vendor}/expression-language) Suggests: php-composer(%{composer_vendor}/finder) @@ -473,7 +477,7 @@ Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version} Requires: php-composer(%{composer_vendor}/var-dumper) = %{version} Requires: php-xml # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/dependency-injection) %endif @@ -509,7 +513,7 @@ Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} Requires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} Requires: php-xml # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/console) Suggests: php-composer(%{composer_vendor}/form) Suggests: php-composer(%{composer_vendor}/property-info) @@ -528,7 +532,7 @@ Requires: php-mbstring Requires: php-pcre Requires: php-reflection Requires: php-spl -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-pecl(apcu) %endif @@ -645,7 +649,7 @@ Requires: php-composer(%{composer_vendor}/process) = %{version} Requires: php-ctype Requires: php-posix Requires: php-spl -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-pcntl # composer.json: optional Suggests: php-composer(%{composer_vendor}/monolog-bridge) @@ -670,7 +674,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/asset.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/http-foundation) %endif # phpcompatinfo for version 4.0.0-beta1 @@ -697,7 +701,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/browser_kit.html # composer.json Requires: php-composer(%{composer_vendor}/dom-crawler) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/process) %endif # phpcompatinfo for version 4.0.0-beta1 @@ -739,7 +743,7 @@ Requires: php-pcre Requires: php-pdo Requires: php-reflection Requires: php-spl -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-pecl(apcu) Suggests: php-pecl(memcached) Suggests: php-pecl(opcache) @@ -771,7 +775,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/config.html # composer.json Requires: php-composer(%{composer_vendor}/filesystem) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/yaml) %endif # phpcompatinfo for version 4.0.0-beta1 @@ -805,7 +809,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/console.html # composer.json Requires: php-composer(%{composer_vendor}/debug) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/event-dispatcher) Suggests: php-composer(%{composer_vendor}/lock) Suggests: php-composer(%{composer_vendor}/process) @@ -871,7 +875,7 @@ Requires: php-json Requires: php-pcre Requires: php-reflection Requires: php-spl -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-pecl(Xdebug) %endif @@ -896,7 +900,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: php-composer(psr/container) >= %{psr_container_min_ver} Requires: php-composer(psr/container) < %{psr_container_max_ver} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/expression-language) Suggests: php-composer(%{composer_vendor}/finder) @@ -932,7 +936,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/dom_crawler.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/css-selector) %endif # phpcompatinfo for version 4.0.0-beta1 @@ -984,7 +988,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/event_dispatcher Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/dependency-injection) Suggests: php-composer(%{composer_vendor}/http-kernel) %endif @@ -1086,7 +1090,7 @@ Requires: php-composer(%{composer_vendor}/intl) = %{version} Requires: php-composer(%{composer_vendor}/options-resolver) = %{version} Requires: php-composer(%{composer_vendor}/property-access) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/framework-bundle) Suggests: php-composer(%{composer_vendor}/security-csrf) Suggests: php-composer(%{composer_vendor}/twig-bridge) @@ -1166,7 +1170,7 @@ Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} Requires: php-composer(psr/log) >= %{psr_log_min_ver} Requires: php-composer(psr/log) < %{psr_log_max_ver} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/browser-kit) Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/console) @@ -1183,7 +1187,7 @@ Requires: php-reflection Requires: php-session Requires: php-spl Requires: php-tokenizer -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-pecl(apcu) Suggests: php-pecl(opcache) Suggests: php-pecl(Xdebug) @@ -1292,7 +1296,7 @@ Requires: php-composer(psr/log) >= %{psr_log_min_ver} Requires: php-hash Requires: php-pcre Requires: php-spl -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-pecl(memcached) Suggests: php-sysvsem %endif @@ -1307,6 +1311,31 @@ Autoloader: %{symfony4_dir}/Component/Lock/autoload.php # ------------------------------------------------------------------------------ +%package messenger + +Summary: Symfony Messenger Component (version 4) +License: MIT + +Requires: %{name}-common = %{version}-%{release} +# phpcompatinfo for version 4.1.4 +Requires: php-date +Requires: php-json +Requires: php-pcntl +Requires: php-spl +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 +Suggests: php-pecl(amqp) +%endif + +# Composer +Provides: php-composer(%{composer_vendor}/messenger) = %{version} + +%description messenger +%{summary}. + +Autoloader: %{symfony4_dir}/Component/Lock/autoload.php + +# ------------------------------------------------------------------------------ + %package options-resolver Summary: Symfony OptionsResolver Component (version 4) @@ -1360,7 +1389,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/property_access. # composer.json Requires: php-composer(%{composer_vendor}/inflector) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(psr/cache-implementation) %endif # phpcompatinfo for version 4.0.0-beta1 @@ -1387,7 +1416,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/property_info.h # composer.json Requires: php-composer(%{composer_vendor}/inflector) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/doctrine-bridge) Suggests: php-composer(%{composer_vendor}/serializer) Suggests: php-composer(psr/cache-implementation) @@ -1418,7 +1447,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/routing.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/dependency-injection) Suggests: php-composer(%{composer_vendor}/expression-language) @@ -1454,7 +1483,7 @@ Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} Requires: php-composer(%{composer_vendor}/property-access) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/expression-language) Suggests: php-composer(%{composer_vendor}/form) Suggests: php-composer(%{composer_vendor}/ldap) @@ -1503,7 +1532,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/serializer.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/http-foundation) Suggests: php-composer(%{composer_vendor}/property-access) @@ -1564,7 +1593,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/templating.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(psr/log) %endif # phpcompatinfo for version 4.0.0-beta1 @@ -1597,7 +1626,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/translation.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/yaml) Suggests: php-composer(psr/log) @@ -1634,7 +1663,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/validator.html # composer.json Requires: php-composer(%{composer_vendor}/translation) = %{version} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/config) Suggests: php-composer(%{composer_vendor}/expression-language) Suggests: php-composer(%{composer_vendor}/http-foundation) @@ -1696,7 +1725,8 @@ Requires: php-posix Requires: php-reflection Requires: php-spl Requires: php-xml -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 +Recommends: php-composer(%{composer_vendor}/console) Suggests: php-mysql Suggests: php-pecl(amqp) Suggests: php-pgsql @@ -1781,7 +1811,7 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/yaml.html Requires: %{name}-common = %{version}-%{release} # composer.json: optional -%if 0%{?fedora} +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Suggests: php-composer(%{composer_vendor}/console) %endif # phpcompatinfo for version 4.0.0-beta1 @@ -1802,6 +1832,7 @@ Autoloader: %{symfony4_dir}/Component/Yaml/autoload.php %prep %setup -qn %{github_name}-%{github_commit} +%patch0 -p1 cp %{SOURCE1} . sed 's#__PHPDIR__#%{phpdir}#' -i $(basename %{SOURCE1}) @@ -1896,12 +1927,14 @@ popd %install -mkdir -p %{buildroot}%{symfony4_dir} +mkdir -p %{buildroot}%{symfony4_dir} %{buildroot}%{_bindir} cp -rp src/Symfony/* %{buildroot}%{symfony4_dir}/ +mv %{buildroot}%{symfony4_dir}/Component/VarDumper/Resources/bin/var-dump-server \ + %{buildroot}%{_bindir}/%{name}-var-dump-server # Symlink main package docs to common sub-package docs mkdir -p %{buildroot}%{_docdir} -%if 0%{?fedora} >= 20 +%if 0%{?fedora} >= 20 || 0%{?rhel} >= 8 ln -s %{name}-common %{buildroot}%{_docdir}/%{name} %else ln -s %{name}-common-%{version} %{buildroot}%{_docdir}/%{name}-%{version} @@ -1966,7 +1999,7 @@ exit $RET %{!?_licensedir:%global license %%doc} %files -%if 0%{?fedora} >= 20 +%if 0%{?fedora} >= 20 || 0%{?rhel} >= 8 %doc %{_docdir}/%{name} %else %doc %{_docdir}/%{name}-%{version} @@ -2510,6 +2543,23 @@ exit $RET # ------------------------------------------------------------------------------ +%files messenger + +# https://github.com/symfony/symfony/issues/28353 +#%%license src/Symfony/Component/Messenger/LICENSE +%doc src/Symfony/Component/Messenger/*.md +%doc src/Symfony/Component/Messenger/composer.json + +%{symfony4_dir}/Component/Messenger +#%%exclude %%{symfony4_dir}/Component/Messenger/LICENSE +%exclude %{symfony4_dir}/Component/Messenger/*.md +%exclude %{symfony4_dir}/Component/Messenger/autoload-dev.php +%exclude %{symfony4_dir}/Component/Messenger/composer.json +%exclude %{symfony4_dir}/Component/Messenger/phpunit.* +%exclude %{symfony4_dir}/Component/Messenger/Tests + +# ------------------------------------------------------------------------------ + %files options-resolver %license src/Symfony/Component/OptionsResolver/LICENSE @@ -2697,6 +2747,7 @@ exit $RET %doc src/Symfony/Component/VarDumper/*.md %doc src/Symfony/Component/VarDumper/composer.json +%{_bindir}/%{name}-var-dump-server %{symfony4_dir}/Component/VarDumper %exclude %{symfony4_dir}/Component/VarDumper/LICENSE %exclude %{symfony4_dir}/Component/VarDumper/*.md @@ -2756,6 +2807,11 @@ exit $RET # ############################################################################## %changelog +* Tue Sep 4 2018 Remi Collet <remi@remirepo.net> - 4.1.4-1 +- update to 4.1.4 +- add new Messenger component in php-symfony4-messenger package +- add php-symfony4-var-dump-server command + * Thu Aug 02 2018 Shawn Iwinski <shawn@iwin.ski> - 4.0.14-1 - Update to 4.0.14 (CVE-2018-14773 / CVE-2018-14774) - Add conflict php-composer(phpdocumentor/type-resolver) < 0.3.0 |