Browse Source

Merge branch 'master' of https://github.com/unaio/una

AntonLV 4 years ago
parent
commit
3607ed5790

+ 1 - 1
inc/classes/BxDolAlerts.php

@@ -79,7 +79,7 @@ class BxDolAlerts extends BxDol
 
         $this->_aAlerts = $aData['alerts'];
         $this->_aHandlers = $aData['handlers'];
-        $this->_aCacheTriggers = $aData['cache_triggers'];
+        $this->_aCacheTriggers = isset($aData['cache_triggers']) ? $aData['cache_triggers'] : [];
 
         $this->sUnit = $sUnit;
         $this->sAction = $sAction;

+ 1 - 1
upgrade/files/13.0.0.B2-13.0.0.B3/files/inc/classes/BxDolAlerts.php

@@ -79,7 +79,7 @@ class BxDolAlerts extends BxDol
 
         $this->_aAlerts = $aData['alerts'];
         $this->_aHandlers = $aData['handlers'];
-        $this->_aCacheTriggers = $aData['cache_triggers'];
+        $this->_aCacheTriggers = isset($aData['cache_triggers']) ? $aData['cache_triggers'] : [];
 
         $this->sUnit = $sUnit;
         $this->sAction = $sAction;

+ 1 - 1
upgrade/files/13.0.0.B2-13.0.0.B3/files/plugins/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitcd534309f1c0c424ed62340baae72832::getLoader();
+return ComposerAutoloaderInit19ea3b9b7cf2870324c7b8ea20dec156::getLoader();

+ 7 - 7
upgrade/files/13.0.0.B2-13.0.0.B3/files/plugins/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitcd534309f1c0c424ed62340baae72832
+class ComposerAutoloaderInit19ea3b9b7cf2870324c7b8ea20dec156
 {
     private static $loader;
 
@@ -24,15 +24,15 @@ class ComposerAutoloaderInitcd534309f1c0c424ed62340baae72832
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitcd534309f1c0c424ed62340baae72832', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit19ea3b9b7cf2870324c7b8ea20dec156', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInitcd534309f1c0c424ed62340baae72832', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit19ea3b9b7cf2870324c7b8ea20dec156', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitcd534309f1c0c424ed62340baae72832::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit19ea3b9b7cf2870324c7b8ea20dec156::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -53,19 +53,19 @@ class ComposerAutoloaderInitcd534309f1c0c424ed62340baae72832
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitcd534309f1c0c424ed62340baae72832::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit19ea3b9b7cf2870324c7b8ea20dec156::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirecd534309f1c0c424ed62340baae72832($fileIdentifier, $file);
+            composerRequire19ea3b9b7cf2870324c7b8ea20dec156($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirecd534309f1c0c424ed62340baae72832($fileIdentifier, $file)
+function composerRequire19ea3b9b7cf2870324c7b8ea20dec156($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

+ 5 - 5
upgrade/files/13.0.0.B2-13.0.0.B3/files/plugins/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitcd534309f1c0c424ed62340baae72832
+class ComposerStaticInit19ea3b9b7cf2870324c7b8ea20dec156
 {
     public static $files = array (
         '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
@@ -214,10 +214,10 @@ class ComposerStaticInitcd534309f1c0c424ed62340baae72832
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitcd534309f1c0c424ed62340baae72832::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitcd534309f1c0c424ed62340baae72832::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInitcd534309f1c0c424ed62340baae72832::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInitcd534309f1c0c424ed62340baae72832::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit19ea3b9b7cf2870324c7b8ea20dec156::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit19ea3b9b7cf2870324c7b8ea20dec156::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit19ea3b9b7cf2870324c7b8ea20dec156::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit19ea3b9b7cf2870324c7b8ea20dec156::$classMap;
 
         }, null, ClassLoader::class);
     }

+ 2 - 2
upgrade/files/13.0.0.B2-13.0.0.B3/files/plugins/composer/installed.php

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'c3310f86ac307559025260ef26c36b7a42126d43',
+        'reference' => 'ab3ece7b6bb9cfd36c7e52c171ecf20429433999',
         'name' => 'unaio/una',
         'dev' => true,
     ),
@@ -332,7 +332,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'c3310f86ac307559025260ef26c36b7a42126d43',
+            'reference' => 'ab3ece7b6bb9cfd36c7e52c171ecf20429433999',
             'dev_requirement' => false,
         ),
         'wikimedia/less.php' => array(