diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-02-23 09:33:41 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-02-23 09:33:41 +0000 |
| commit | c42d24a9cddc9cf3828f4ff472f434e6a8c20610 (patch) | |
| tree | 727125a4f11d0f919fba4cd0478cc5d23f04eb64 | |
| parent | ca52a40817ad7cecb36551dab9c7d5013162748a (diff) | |
| download | webtrees-c42d24a9cddc9cf3828f4ff472f434e6a8c20610.tar.gz webtrees-c42d24a9cddc9cf3828f4ff472f434e6a8c20610.tar.bz2 webtrees-c42d24a9cddc9cf3828f4ff472f434e6a8c20610.zip | |
Use 'suggest' for database drivers, update vendor directory
| -rw-r--r-- | composer.json | 10 | ||||
| -rw-r--r-- | composer.lock | 5 | ||||
| -rw-r--r-- | vendor/autoload.php | 2 | ||||
| -rw-r--r-- | vendor/bin/.gitignore | 2 | ||||
| l--------- | vendor/bin/commonmark | 1 | ||||
| l--------- | vendor/bin/doctrine-dbal | 1 | ||||
| -rw-r--r-- | vendor/composer/autoload_real.php | 14 | ||||
| -rw-r--r-- | vendor/composer/autoload_static.php | 12 | ||||
| -rw-r--r-- | vendor/fisharebest/ext-calendar/src/JewishCalendar.php | 2 | ||||
| -rw-r--r-- | vendor/fisharebest/ext-calendar/src/Shim.php | 8 |
10 files changed, 32 insertions, 25 deletions
diff --git a/composer.json b/composer.json index a8da9388ae..ea0cc50b2b 100644 --- a/composer.json +++ b/composer.json @@ -31,8 +31,6 @@ "ext-json": "*", "ext-pcre": "*", "ext-pdo": "*", - "ext-pdo_mysql": "*", - "ext-pdo_sqlite": "*", "ext-session": "*", "ext-simplexml": "*", "ext-sqlite3": "*", @@ -66,6 +64,8 @@ "webuni/commonmark-table-extension": "~0.9" }, "require-dev": { + "ext-sqlite3": "*", + "ext-pdo_sqlite": "*", "league/flysystem-memory": "*", "maximebf/debugbar": "*", "mockery/mockery": "*", @@ -74,6 +74,12 @@ "wapmorgan/php-code-fixer": "*", "wata727/pahout": "*" }, + "suggest": { + "ext-pdo_mysql": "Required to use MySQL for database storage", + "ext-pdo_sqlite": "Required to use SQLite for database storage", + "ext-pdo_pgsql": "Required to use PostgreSQ: for database storage", + "ext-pdo_sqlsvr": "Required to use SQL Server for database storage" + }, "scripts": { "webtrees:build": [ "@composer webtrees:mo", diff --git a/composer.lock b/composer.lock index 7dc97564b0..e6330b604c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6d3019e13689fc626348836d47d2b55c", + "content-hash": "0db73be1e54eddcaba5f740e4cb760a6", "packages": [ { "name": "doctrine/cache", @@ -5220,13 +5220,14 @@ "ext-json": "*", "ext-pcre": "*", "ext-pdo": "*", - "ext-pdo_mysql": "*", "ext-session": "*", "ext-simplexml": "*", + "ext-sqlite3": "*", "ext-xml": "*", "ext-zip": "*" }, "platform-dev": { + "ext-sqlite3": "*", "ext-pdo_sqlite": "*" }, "platform-overrides": { diff --git a/vendor/autoload.php b/vendor/autoload.php index 42b200defa..776ab4140c 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit3da29173c262c589b273f6106eae3544::getLoader(); +return ComposerAutoloaderInit74b5eb00e70cef0c1fba9491b929fdd1::getLoader(); diff --git a/vendor/bin/.gitignore b/vendor/bin/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/vendor/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/vendor/bin/commonmark b/vendor/bin/commonmark new file mode 120000 index 0000000000..a3351cea80 --- /dev/null +++ b/vendor/bin/commonmark @@ -0,0 +1 @@ +../league/commonmark/bin/commonmark
\ No newline at end of file diff --git a/vendor/bin/doctrine-dbal b/vendor/bin/doctrine-dbal new file mode 120000 index 0000000000..58a8a89c2c --- /dev/null +++ b/vendor/bin/doctrine-dbal @@ -0,0 +1 @@ +../doctrine/dbal/bin/doctrine-dbal
\ No newline at end of file diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index caa2ef9613..3840c609b9 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit3da29173c262c589b273f6106eae3544 +class ComposerAutoloaderInit74b5eb00e70cef0c1fba9491b929fdd1 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit3da29173c262c589b273f6106eae3544 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit3da29173c262c589b273f6106eae3544', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit74b5eb00e70cef0c1fba9491b929fdd1', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit3da29173c262c589b273f6106eae3544', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit74b5eb00e70cef0c1fba9491b929fdd1', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit3da29173c262c589b273f6106eae3544::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit74b5eb00e70cef0c1fba9491b929fdd1::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit3da29173c262c589b273f6106eae3544 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit3da29173c262c589b273f6106eae3544::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit74b5eb00e70cef0c1fba9491b929fdd1::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire3da29173c262c589b273f6106eae3544($fileIdentifier, $file); + composerRequire74b5eb00e70cef0c1fba9491b929fdd1($fileIdentifier, $file); } return $loader; } } -function composerRequire3da29173c262c589b273f6106eae3544($fileIdentifier, $file) +function composerRequire74b5eb00e70cef0c1fba9491b929fdd1($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 8bf6e5a677..6eaf6ffb51 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit3da29173c262c589b273f6106eae3544 +class ComposerStaticInit74b5eb00e70cef0c1fba9491b929fdd1 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -316,11 +316,11 @@ class ComposerStaticInit3da29173c262c589b273f6106eae3544 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit3da29173c262c589b273f6106eae3544::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit3da29173c262c589b273f6106eae3544::$prefixDirsPsr4; - $loader->fallbackDirsPsr4 = ComposerStaticInit3da29173c262c589b273f6106eae3544::$fallbackDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInit3da29173c262c589b273f6106eae3544::$prefixesPsr0; - $loader->classMap = ComposerStaticInit3da29173c262c589b273f6106eae3544::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit74b5eb00e70cef0c1fba9491b929fdd1::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit74b5eb00e70cef0c1fba9491b929fdd1::$prefixDirsPsr4; + $loader->fallbackDirsPsr4 = ComposerStaticInit74b5eb00e70cef0c1fba9491b929fdd1::$fallbackDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInit74b5eb00e70cef0c1fba9491b929fdd1::$prefixesPsr0; + $loader->classMap = ComposerStaticInit74b5eb00e70cef0c1fba9491b929fdd1::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/fisharebest/ext-calendar/src/JewishCalendar.php b/vendor/fisharebest/ext-calendar/src/JewishCalendar.php index a9a77e3115..1d38bc927d 100644 --- a/vendor/fisharebest/ext-calendar/src/JewishCalendar.php +++ b/vendor/fisharebest/ext-calendar/src/JewishCalendar.php @@ -624,7 +624,7 @@ class JewishCalendar implements CalendarInterface */ public function jdToHebrew($julian_day, $alafim_garesh, $alafim, $gereshayim) { - [$year, $month, $day] = $this->jdToYmd($julian_day); + list($year, $month, $day) = $this->jdToYmd($julian_day); return $this->numberToHebrewNumeralsIso8859($day, $gereshayim) . ' ' . diff --git a/vendor/fisharebest/ext-calendar/src/Shim.php b/vendor/fisharebest/ext-calendar/src/Shim.php index 1651f9a6b3..c9ad803638 100644 --- a/vendor/fisharebest/ext-calendar/src/Shim.php +++ b/vendor/fisharebest/ext-calendar/src/Shim.php @@ -286,7 +286,7 @@ class Shim */ private static function calFromJdCalendar($julian_day, $mdy, $months, $months_short) { - [$month, $day, $year] = explode('/', $mdy); + list($month, $day, $year) = explode('/', $mdy); return array( 'date' => $month . '/' . $day . '/' . $year, @@ -576,7 +576,7 @@ class Shim */ private static function jdMonthNameCalendar(CalendarInterface $calendar, $julian_day, $months) { - [, $month] = $calendar->jdToYmd($julian_day); + list(, $month) = $calendar->jdToYmd($julian_day); return $months[$month]; } @@ -590,7 +590,7 @@ class Shim */ private static function jdMonthNameJewishMonths($julian_day) { - [, , $year] = explode('/', self::jdToCalendar(self::$jewish_calendar, $julian_day, 347998, 324542846)); + list(, , $year) = explode('/', self::jdToCalendar(self::$jewish_calendar, $julian_day, 347998, 324542846)); if (self::$jewish_calendar->isLeapYear($year)) { return self::shouldEmulateBug54254() ? self::$MONTH_NAMES_JEWISH_54254 : self::$MONTH_NAMES_JEWISH_LEAP_YEAR; @@ -614,7 +614,7 @@ class Shim private static function jdToCalendar(CalendarInterface $calendar, $julian_day, $min_jd, $max_jd) { if ($julian_day >= $min_jd && $julian_day <= $max_jd) { - [$year, $month, $day] = $calendar->jdToYmd($julian_day); + list($year, $month, $day) = $calendar->jdToYmd($julian_day); return $month . '/' . $day . '/' . $year; } else { |
