CVS commit: pkgsrc/www/drupal8

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Wed Jan  9 11:56:17 UTC 2019

Modified Files:
        pkgsrc/www/drupal8: Makefile distinfo
Added Files:
        pkgsrc/www/drupal8/patches:
            patch-core_lib_Drupal_Core_Extension_ModulesHandler.php

Log Message:
drupal8 fix for:

Drupal\Core\Extension\Exception\UnknownExtensionException: The module standard does not exist. in Drupal\Core\Extension\ExtensionList->get() (line 257 of 
/usr/pkg/share/drupal/core/lib/Drupal/Core/Extension/ExtensionList.php)

e.g. when trying to put the site in maintenance mode.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/drupal8/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/drupal8/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/drupal8/patches/patch-core_lib_Drupal_Core_Extension_ModulesHandler.php

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/drupal8/Makefile
diff -u pkgsrc/www/drupal8/Makefile:1.14 pkgsrc/www/drupal8/Makefile:1.15
--- pkgsrc/www/drupal8/Makefile:1.14    Fri Jan  4 08:17:37 2019
+++ pkgsrc/www/drupal8/Makefile Wed Jan  9 11:56:17 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2019/01/04 08:17:37 wen Exp $
+# $NetBSD: Makefile,v 1.15 2019/01/09 11:56:17 prlw1 Exp $
 
 DISTNAME=      drupal-8.6.5
+PKGREVISION=   1
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=    www
 MASTER_SITES=  http://ftp.drupal.org/files/projects/
@@ -66,6 +67,9 @@ INSTALLATION_DIRS+=   ${DRUPAL}/${i}
 post-extract:
        ${CP} ${FILESDIR}/drupal.conf ${WRKSRC}
 
+pre-install:
+       ${RM} ${WRKSRC}/core/lib/Drupal/Core/Extension/ModuleHandler.php.orig
+
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${PREFIX}/${DRUPAL}
        ${INSTALL_DATA} ${WRKSRC}/drupal.conf \

Index: pkgsrc/www/drupal8/distinfo
diff -u pkgsrc/www/drupal8/distinfo:1.13 pkgsrc/www/drupal8/distinfo:1.14
--- pkgsrc/www/drupal8/distinfo:1.13    Fri Jan  4 08:17:37 2019
+++ pkgsrc/www/drupal8/distinfo Wed Jan  9 11:56:17 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2019/01/04 08:17:37 wen Exp $
+$NetBSD: distinfo,v 1.14 2019/01/09 11:56:17 prlw1 Exp $
 
 SHA1 (drupal-8.6.5.tar.gz) = 4df0ff5b2455db17bf753acb4facc8b1287caf23
 RMD160 (drupal-8.6.5.tar.gz) = e6d7bf440935e64fd8095f42f5ab7b741c687d4b
 SHA512 (drupal-8.6.5.tar.gz) = 7298b315c14931c24a1f433625c91a96bb2c7d09ab6ceac31fba62d316604a8b72c13941ef99ffc878ff697f00fb70924f6ffdd23081ec1c9258d0dba1b52e76
 Size (drupal-8.6.5.tar.gz) = 16465640 bytes
+SHA1 (patch-core_lib_Drupal_Core_Extension_ModulesHandler.php) = 3d3bb6f82f14d213c805e9958916b1fab3169fe7

Added files:

Index: pkgsrc/www/drupal8/patches/patch-core_lib_Drupal_Core_Extension_ModulesHandler.php
diff -u /dev/null pkgsrc/www/drupal8/patches/patch-core_lib_Drupal_Core_Extension_ModulesHandler.php:1.1
--- /dev/null   Wed Jan  9 11:56:17 2019
+++ pkgsrc/www/drupal8/patches/patch-core_lib_Drupal_Core_Extension_ModulesHandler.php  Wed Jan  9 11:56:17 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-core_lib_Drupal_Core_Extension_ModulesHandler.php,v 1.1 2019/01/09 11:56:17 prlw1 Exp $
+
+Avoids UnknownExtensionException:
+https://www.drupal.org/project/drupal/issues/3000677
+
+--- core/lib/Drupal/Core/Extension/ModuleHandler.php.orig      2019-01-02 21:52:52.000000000 +0000
++++ core/lib/Drupal/Core/Extension/ModuleHandler.php
+@@ -777,7 +777,13 @@ class ModuleHandler implements ModuleHan
+    * {@inheritdoc}
+    */
+   public function getName($module) {
+-    return \Drupal::service('extension.list.module')->getName($module);
++    try {
++      return \Drupal::service('extension.list.module')->getName($module);
++    }
++    catch (UnknownExtensionException $e) {
++      @trigger_error('Calling ModuleHandler::getName() with an unknown module is deprecated in Drupal 8.7.0 and support for this will be removed in Drupal 9.0.0, check that the module exists before 
calling this method. See https://www.drupal.org/node/3024541.', E_USER_DEPRECATED);
++      return $module;
++    }
+   }
+ 
+ }