[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    siwinski pushed to drupal8 (master). "Fix autoload of symfony/psr-http-message-bridge and symfony-cm
From:       notifications () fedoraproject ! org
Date:       2018-03-31 19:11:23
Message-ID: 20180331191123.7F8D26075F06 () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

From 2b082882a1b0c5fdce466bd32b7b41bf84235bbc Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <shawn@iwin.ski>
Date: Mar 31 2018 19:10:33 +0000
Subject: Fix autoload of symfony/psr-http-message-bridge and symfony-cmf/routing


- Add conflict when Twig v2 is installed

---

diff --git a/drupal8-autoload.php b/drupal8-autoload.php
index 6b2092e..c9bb5fb 100644
--- a/drupal8-autoload.php
+++ b/drupal8-autoload.php
@@ -28,8 +28,8 @@ require_once '__PHPDIR__/GuzzleHttp6/autoload.php';
 require_once '__PHPDIR__/Masterminds/HTML5/autoload.php';
 require_once '__PHPDIR__/random_compat/autoload.php';
 require_once '__PHPDIR__/Stack/autoload-builder.php';
-require_once '__PHPDIR__/Symfony3/Bridge/PsrHttpMessage/autoload.php';
-require_once '__PHPDIR__/Symfony3/Cmf/Component/Routing/autoload.php';
+require_once '__PHPDIR__/Symfony/Bridge/PsrHttpMessage/autoload.php';
+require_once '__PHPDIR__/Symfony/Cmf/Component/Routing/autoload.php';
 require_once '__PHPDIR__/Symfony3/Component/ClassLoader/autoload.php';
 require_once '__PHPDIR__/Symfony3/Component/Console/autoload.php';
 require_once '__PHPDIR__/Symfony3/Component/DependencyInjection/autoload.php';
diff --git a/drupal8.spec b/drupal8.spec
index edb653f..4892b74 100644
--- a/drupal8.spec
+++ b/drupal8.spec
@@ -101,7 +101,7 @@ AutoReqProv: no
 
 Name:      drupal8
 Version:   8.4.6
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   An open source content management platform
 
 # Licenses:
@@ -261,6 +261,17 @@ Recommends: %{name}-httpd = %{version}-%{release}
 # core/composer.json: conflicts
 Conflicts: php-composer(drush/drush) < 8.1.10
 
+# Known conflict when Twig v2 is installed
+#
+# PHP Fatal error:  Class Drupal\Core\Template\Loader\StringLoader
+# contains 1 abstract method and must therefore be declared abstract
+# or implement the remaining methods (Twig_LoaderInterface::getSourceContext)
+# in /usr/share/drupal8/core/lib/Drupal/Core/Template/Loader/StringLoader.php
+# on line 23
+#
+# @todo Fix this conflict so Twig v2 is not autoloaded when installed
+Conflicts: php-composer(twig/twig) >= %{twig_max_ver}
+
 # drupal8(*) virtual provides
 ## Core
 Provides:  drupal8(core) = %{version}
@@ -1077,6 +1088,10 @@ popd
 #-------------------------------------------------------------------------------
 
 %changelog
+* Sat Mar 31 2018 Shawn Iwinski <shawn@iwin.ski> - 8.4.6-2
+- Fix autoload of symfony/psr-http-message-bridge and symfony-cmf/routing
+- Add conflict when Twig v2 is installed
+
 * Wed Mar 28 2018 Shawn Iwinski <shawn@iwin.ski> - 8.4.6-1
 - Update to 8.4.6 (SA-CORE-2018-002 / CVE-2018-7600)
 - Make scripts' dependencies match Drupal Symfony version constraints


	https://src.fedoraproject.org/rpms/drupal8/c/2b082882a1b0c5fdce466bd32b7b41bf84235bbc?branch=master
_______________________________________________
scm-commits mailing list -- scm-commits@lists.fedoraproject.org
To unsubscribe send an email to scm-commits-leave@lists.fedoraproject.org

[prev in list] [next in list] [prev in thread] [next in thread]