Commit dcc8f7ba authored by Andy Brüchert's avatar Andy Brüchert
Browse files

Merge master into develop

Conflicts:
	vendor/autoload.php
	vendor/composer/InstalledVersions.php
	vendor/composer/autoload_files.php
	vendor/composer/autoload_real.php
	vendor/composer/autoload_static.php
	vendor/composer/installed.json
	vendor/composer/installed.php
parents e3b598d8 569c72f4
......@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit50475ab8ab4d6771ea769ff9ff1a4e6a::getLoader();
return ComposerAutoloaderInitc2781241b06cffdb64225f5dd1f3e406::getLoader();
......@@ -19,7 +19,7 @@ private static $installed = array (
'aliases' =>
array (
),
'reference' => '4ed7f67bcd080d6247f7e9697b94bcc9613b59ec',
'reference' => '6866de748eb52724d1bb281dd915105f3ea908d9',
'name' => '__root__',
),
'versions' =>
......@@ -31,7 +31,7 @@ private static $installed = array (
'aliases' =>
array (
),
'reference' => '4ed7f67bcd080d6247f7e9697b94bcc9613b59ec',
'reference' => '6866de748eb52724d1bb281dd915105f3ea908d9',
),
'guzzlehttp/guzzle' =>
array (
......
......@@ -8,6 +8,7 @@ $baseDir = dirname($vendorDir);
return array(
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
......
......@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit50475ab8ab4d6771ea769ff9ff1a4e6a
class ComposerAutoloaderInitc2781241b06cffdb64225f5dd1f3e406
{
private static $loader;
......@@ -24,15 +24,15 @@ class ComposerAutoloaderInit50475ab8ab4d6771ea769ff9ff1a4e6a
require __DIR__ . '/platform_check.php';
spl_autoload_register(array('ComposerAutoloaderInit50475ab8ab4d6771ea769ff9ff1a4e6a', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitc2781241b06cffdb64225f5dd1f3e406', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit50475ab8ab4d6771ea769ff9ff1a4e6a', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitc2781241b06cffdb64225f5dd1f3e406', '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\ComposerStaticInit50475ab8ab4d6771ea769ff9ff1a4e6a::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitc2781241b06cffdb64225f5dd1f3e406::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
......@@ -53,19 +53,19 @@ class ComposerAutoloaderInit50475ab8ab4d6771ea769ff9ff1a4e6a
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit50475ab8ab4d6771ea769ff9ff1a4e6a::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitc2781241b06cffdb64225f5dd1f3e406::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire50475ab8ab4d6771ea769ff9ff1a4e6a($fileIdentifier, $file);
composerRequirec2781241b06cffdb64225f5dd1f3e406($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire50475ab8ab4d6771ea769ff9ff1a4e6a($fileIdentifier, $file)
function composerRequirec2781241b06cffdb64225f5dd1f3e406($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
......
......@@ -4,11 +4,12 @@
namespace Composer\Autoload;
class ComposerStaticInit50475ab8ab4d6771ea769ff9ff1a4e6a
class ComposerStaticInitc2781241b06cffdb64225f5dd1f3e406
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php',
......@@ -218,10 +219,10 @@ class ComposerStaticInit50475ab8ab4d6771ea769ff9ff1a4e6a
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit50475ab8ab4d6771ea769ff9ff1a4e6a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit50475ab8ab4d6771ea769ff9ff1a4e6a::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit50475ab8ab4d6771ea769ff9ff1a4e6a::$prefixesPsr0;
$loader->classMap = ComposerStaticInit50475ab8ab4d6771ea769ff9ff1a4e6a::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitc2781241b06cffdb64225f5dd1f3e406::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitc2781241b06cffdb64225f5dd1f3e406::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInitc2781241b06cffdb64225f5dd1f3e406::$prefixesPsr0;
$loader->classMap = ComposerStaticInitc2781241b06cffdb64225f5dd1f3e406::$classMap;
}, null, ClassLoader::class);
}
......
......@@ -216,7 +216,7 @@
"version_normalized": "dev-master",
"source": {
"type": "git",
"url": "https://git.hab.de/dmj/php-paginator.git",
"url": "https://github.com/dmj/php-paginator.git",
"reference": "82429eeee25412b638da3b18d519fc9cb9b4568a"
},
"time": "2017-03-22T08:37:43+00:00",
......@@ -236,7 +236,7 @@
"version_normalized": "dev-master",
"source": {
"type": "git",
"url": "https://git.hab.de/dmj/php-solr.git",
"url": "https://github.com/dmj/php-solr.git",
"reference": "ef528a52d57493ad2ae575037e42442075135f62"
},
"require": {
......
......@@ -6,7 +6,7 @@
'aliases' =>
array (
),
'reference' => '4ed7f67bcd080d6247f7e9697b94bcc9613b59ec',
'reference' => '6866de748eb52724d1bb281dd915105f3ea908d9',
'name' => '__root__',
),
'versions' =>
......@@ -18,7 +18,7 @@
'aliases' =>
array (
),
'reference' => '4ed7f67bcd080d6247f7e9697b94bcc9613b59ec',
'reference' => '6866de748eb52724d1bb281dd915105f3ea908d9',
),
'guzzlehttp/guzzle' =>
array (
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment