Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit bbff817

Browse files
committed
Update Guzzle Version + Manually fix symfony components to stick to php5.4 compliance
1 parent c73da14 commit bbff817

File tree

102 files changed

+2009
-4929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2009
-4929
lines changed

core/src/core/classes/guzzle/vendor/composer/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Copyright (c) 2015 Nils Adermann, Jordi Boggiano
2+
Copyright (c) 2016 Nils Adermann, Jordi Boggiano
33

44
Permission is hereby granted, free of charge, to any person obtaining a copy
55
of this software and associated documentation files (the "Software"), to deal

core/src/core/classes/guzzle/vendor/composer/autoload_classmap.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@
66
$baseDir = dirname($vendorDir);
77

88
return array(
9+
'BeforeValidException' => $vendorDir . '/firebase/php-jwt/Exceptions/BeforeValidException.php',
10+
'ExpiredException' => $vendorDir . '/firebase/php-jwt/Exceptions/ExpiredException.php',
11+
'JWT' => $vendorDir . '/firebase/php-jwt/Authentication/JWT.php',
12+
'SignatureInvalidException' => $vendorDir . '/firebase/php-jwt/Exceptions/SignatureInvalidException.php',
913
);

core/src/core/classes/guzzle/vendor/composer/autoload_psr4.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@
1616
'GuzzleHttp\\Command\\Guzzle\\' => array($vendorDir . '/guzzlehttp/guzzle-services/src'),
1717
'GuzzleHttp\\Command\\' => array($vendorDir . '/guzzlehttp/command/src'),
1818
'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
19+
'CommerceGuys\\Guzzle\\Oauth2\\' => array($vendorDir . '/commerceguys/guzzle-oauth2-plugin/src'),
1920
);

core/src/core/classes/guzzle/vendor/composer/autoload_real.php

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,35 @@ public static function getLoader()
2323
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
2424
spl_autoload_unregister(array('ComposerAutoloaderInitd34ad80d4d6e8f56f3411c9698c8a661', 'loadClassLoader'));
2525

26-
$map = require __DIR__ . '/autoload_namespaces.php';
27-
foreach ($map as $namespace => $path) {
28-
$loader->set($namespace, $path);
29-
}
26+
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
27+
if ($useStaticLoader) {
28+
require_once __DIR__ . '/autoload_static.php';
3029

31-
$map = require __DIR__ . '/autoload_psr4.php';
32-
foreach ($map as $namespace => $path) {
33-
$loader->setPsr4($namespace, $path);
34-
}
30+
call_user_func(\Composer\Autoload\ComposerStaticInitd34ad80d4d6e8f56f3411c9698c8a661::getInitializer($loader));
31+
} else {
32+
$map = require __DIR__ . '/autoload_namespaces.php';
33+
foreach ($map as $namespace => $path) {
34+
$loader->set($namespace, $path);
35+
}
3536

36-
$classMap = require __DIR__ . '/autoload_classmap.php';
37-
if ($classMap) {
38-
$loader->addClassMap($classMap);
37+
$map = require __DIR__ . '/autoload_psr4.php';
38+
foreach ($map as $namespace => $path) {
39+
$loader->setPsr4($namespace, $path);
40+
}
41+
42+
$classMap = require __DIR__ . '/autoload_classmap.php';
43+
if ($classMap) {
44+
$loader->addClassMap($classMap);
45+
}
3946
}
4047

4148
$loader->register(true);
4249

43-
$includeFiles = require __DIR__ . '/autoload_files.php';
50+
if ($useStaticLoader) {
51+
$includeFiles = Composer\Autoload\ComposerStaticInitd34ad80d4d6e8f56f3411c9698c8a661::$files;
52+
} else {
53+
$includeFiles = require __DIR__ . '/autoload_files.php';
54+
}
4455
foreach ($includeFiles as $fileIdentifier => $file) {
4556
composerRequired34ad80d4d6e8f56f3411c9698c8a661($fileIdentifier, $file);
4657
}

0 commit comments

Comments
 (0)