Skip to content

Commit 8e2b34a

Browse files
committed
Revert "Round trip PostgreSQL removal"
This reverts commit 5616af3.
1 parent 5616af3 commit 8e2b34a

File tree

12 files changed

+857
-5941
lines changed

12 files changed

+857
-5941
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"react/dns" : ">=1.13.0",
3737
"react/socket" : ">=1.16.0",
3838

39-
"tsugi/lib": "dev-master#49b2107797f2936631739ccef847405b3d26a27a",
39+
"tsugi/lib": "dev-master#98f76a64ee0ea00287bebfffc35757fd29c583ca",
4040
"koseu/lib": "dev-master#c5a8e2bd56a33e1a65731a13ed4f350769c9ab3b"
4141
},
4242
"config": {

composer.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/autoload.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
echo $err;
1515
}
1616
}
17-
trigger_error(
18-
$err,
19-
E_USER_ERROR
20-
);
17+
throw new RuntimeException($err);
2118
}
2219

2320
require_once __DIR__ . '/composer/autoload_real.php';

vendor/composer/InstalledVersions.php

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
*/
2727
class InstalledVersions
2828
{
29+
/**
30+
* @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
31+
* @internal
32+
*/
33+
private static $selfDir = null;
34+
2935
/**
3036
* @var mixed[]|null
3137
* @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
@@ -322,6 +328,18 @@ public static function reload($data)
322328
self::$installedIsLocalDir = false;
323329
}
324330

331+
/**
332+
* @return string
333+
*/
334+
private static function getSelfDir()
335+
{
336+
if (self::$selfDir === null) {
337+
self::$selfDir = strtr(__DIR__, '\\', '/');
338+
}
339+
340+
return self::$selfDir;
341+
}
342+
325343
/**
326344
* @return array[]
327345
* @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
@@ -336,7 +354,7 @@ private static function getInstalled()
336354
$copiedLocalDir = false;
337355

338356
if (self::$canGetVendors) {
339-
$selfDir = strtr(__DIR__, '\\', '/');
357+
$selfDir = self::getSelfDir();
340358
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
341359
$vendorDir = strtr($vendorDir, '\\', '/');
342360
if (isset(self::$installedByVendor[$vendorDir])) {

vendor/composer/autoload_classmap.php

Lines changed: 0 additions & 1227 deletions
Large diffs are not rendered by default.

vendor/composer/autoload_files.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
'662a729f963d39afe703c9d9b7ab4a8c' => $vendorDir . '/symfony/polyfill-php83/bootstrap.php',
2323
'ef65a1626449d89d0811cf9befce46f0' => $vendorDir . '/illuminate/events/functions.php',
2424
'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
25-
'667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
2625
'47e1160838b5e5a10346ac4084b58c23' => $vendorDir . '/laravel/prompts/src/helpers.php',
27-
'606a39d89246991a373564698c2d8383' => $vendorDir . '/symfony/polyfill-php85/bootstrap.php',
26+
'667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
2827
'35a6ad97d21e794e7e22a17d806652e4' => $vendorDir . '/nunomaduro/termwind/src/Functions.php',
28+
'606a39d89246991a373564698c2d8383' => $vendorDir . '/symfony/polyfill-php85/bootstrap.php',
2929
'7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
3030
'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
3131
'e39a8b23c42d4e1452234d762b03835a' => $vendorDir . '/ramsey/uuid/src/functions.php',
@@ -36,10 +36,6 @@
3636
'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
3737
'2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
3838
'1f87db08236948d07391152dccb70f04' => $vendorDir . '/google/apiclient-services/autoload.php',
39-
'6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
40-
'2a3c2110e8e0295330dc3d11a4cbc4cb' => $vendorDir . '/php-webdriver/webdriver/lib/Exception/TimeoutException.php',
4139
'a8d3953fd9959404dd22d3dfcd0a79f0' => $vendorDir . '/google/apiclient/src/aliases.php',
42-
'9b38cf48e83f5d8f60375221cd213eee' => $vendorDir . '/phpstan/phpstan/bootstrap.php',
43-
'ec07570ca5a812141189b1fa81503674' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert/Functions.php',
4440
'972fda704d680a3a53c68e34e193cb22' => $vendorDir . '/react/promise-timer/src/functions_include.php',
4541
);

vendor/composer/autoload_psr4.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@
2222
'Symfony\\Contracts\\Service\\' => array($vendorDir . '/symfony/service-contracts'),
2323
'Symfony\\Contracts\\HttpClient\\' => array($vendorDir . '/symfony/http-client-contracts'),
2424
'Symfony\\Contracts\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher-contracts'),
25-
'Symfony\\Component\\VarExporter\\' => array($vendorDir . '/symfony/var-exporter'),
2625
'Symfony\\Component\\VarDumper\\' => array($vendorDir . '/symfony/var-dumper'),
2726
'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
2827
'Symfony\\Component\\String\\' => array($vendorDir . '/symfony/string'),
2928
'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
3029
'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
31-
'Symfony\\Component\\Panther\\' => array($vendorDir . '/symfony/panther/src'),
3230
'Symfony\\Component\\Mime\\' => array($vendorDir . '/symfony/mime'),
3331
'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
3432
'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
@@ -37,7 +35,6 @@
3735
'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
3836
'Symfony\\Component\\ErrorHandler\\' => array($vendorDir . '/symfony/error-handler'),
3937
'Symfony\\Component\\DomCrawler\\' => array($vendorDir . '/symfony/dom-crawler'),
40-
'Symfony\\Component\\DependencyInjection\\' => array($vendorDir . '/symfony/dependency-injection'),
4138
'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
4239
'Symfony\\Component\\Clock\\' => array($vendorDir . '/symfony/clock'),
4340
'Symfony\\Component\\BrowserKit\\' => array($vendorDir . '/symfony/browser-kit'),
@@ -58,7 +55,6 @@
5855
'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
5956
'Psr\\Clock\\' => array($vendorDir . '/psr/clock/src'),
6057
'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
61-
'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
6258
'PhpOption\\' => array($vendorDir . '/phpoption/phpoption/src/PhpOption'),
6359
'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
6460
'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
@@ -101,13 +97,11 @@
10197
'Fruitcake\\Cors\\' => array($vendorDir . '/fruitcake/php-cors/src'),
10298
'Firebase\\JWT\\' => array($vendorDir . '/firebase/php-jwt/src'),
10399
'FastRoute\\' => array($vendorDir . '/nikic/fast-route/src'),
104-
'Facebook\\WebDriver\\' => array($vendorDir . '/php-webdriver/webdriver/lib'),
105100
'Evenement\\' => array($vendorDir . '/evenement/evenement/src'),
106101
'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/src'),
107102
'Dotenv\\' => array($vendorDir . '/vlucas/phpdotenv/src'),
108103
'Doctrine\\Inflector\\' => array($vendorDir . '/doctrine/inflector/src'),
109104
'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/src'),
110-
'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'),
111105
'Cron\\' => array($vendorDir . '/dragonmantank/cron-expression/src/Cron'),
112106
'Carbon\\Doctrine\\' => array($vendorDir . '/carbonphp/carbon-doctrine-types/src/Carbon/Doctrine'),
113107
'Carbon\\' => array($vendorDir . '/nesbot/carbon/src/Carbon'),

vendor/composer/autoload_real.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25+
require __DIR__ . '/platform_check.php';
26+
2527
spl_autoload_register(array('ComposerAutoloaderInit687bd735fc487d23f01529fcf7aa762c', 'loadClassLoader'), true, true);
2628
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
2729
spl_autoload_unregister(array('ComposerAutoloaderInit687bd735fc487d23f01529fcf7aa762c', 'loadClassLoader'));

0 commit comments

Comments
 (0)