Hello community, here is the log from the commit of package platformsh-cli for openSUSE:Factory checked in at 2019-04-08 10:36:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old) and /work/SRC/openSUSE:Factory/.platformsh-cli.new.3908 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "platformsh-cli" Mon Apr 8 10:36:20 2019 rev:67 rq:691855 version:3.40.11 Changes: -------- --- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes 2019-04-02 09:24:03.592780536 +0200 +++ /work/SRC/openSUSE:Factory/.platformsh-cli.new.3908/platformsh-cli.changes 2019-04-08 10:36:29.231221810 +0200 @@ -1,0 +2,18 @@ +Fri Apr 05 14:45:58 UTC 2019 - jimmy@boombatower.com + +- Update to version 3.40.11: + * Release v3.40.11 + * Release v3.40.10 + * Drush aliases: actually use the new app root for non-local environments + * Release v3.40.9 + * Drush aliases: SSH for the app root for all non-local environments + * self:release: check for changes since the last version + * Text/help improvements to the e:init command (and un-hide it) + * Fix silent failure with invalid project IDs in multi command + * Some self:release cleanup and DX + * Ensure cwd in getVersion() + * Always include compare link in release description + * Fix tests for Console domain + * Replace dev application version using Git + +------------------------------------------------------------------- Old: ---- platformsh-cli-3.40.8.tar.xz New: ---- platformsh-cli-3.40.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ platformsh-cli.spec ++++++ --- /var/tmp/diff_new_pack.Z6FRgS/_old 2019-04-08 10:36:30.011222154 +0200 +++ /var/tmp/diff_new_pack.Z6FRgS/_new 2019-04-08 10:36:30.015222156 +0200 @@ -17,7 +17,7 @@ Name: platformsh-cli -Version: 3.40.8 +Version: 3.40.11 Release: 0 Summary: Tool for managing Platform.sh services from the command line # See licenses.txt for dependency licenses. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Z6FRgS/_old 2019-04-08 10:36:30.035222165 +0200 +++ /var/tmp/diff_new_pack.Z6FRgS/_new 2019-04-08 10:36:30.035222165 +0200 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> - <param name="revision">refs/tags/v3.40.8</param> + <param name="revision">refs/tags/v3.40.11</param> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Z6FRgS/_old 2019-04-08 10:36:30.051222172 +0200 +++ /var/tmp/diff_new_pack.Z6FRgS/_new 2019-04-08 10:36:30.051222172 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> - <param name="changesrevision">c64598f7b0077110acc5c459023dc70a17a56cc7</param> + <param name="changesrevision">c98278b4b6e86d82c34b77baae48423407867fe7</param> </service> </servicedata> ++++++ platformsh-cli-3.40.8.tar.xz -> platformsh-cli-3.40.11.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/README.md new/platformsh-cli-3.40.11/README.md --- old/platformsh-cli-3.40.8/README.md 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/README.md 2019-04-04 15:23:21.000000000 +0200 @@ -117,6 +117,7 @@ environment:drush (drush) Run a drush command on the remote environment environment:http-access (httpaccess) Update HTTP access settings for an environment environment:info Read or set properties for an environment + environment:init Initialize an environment from a public Git repository environment:list (environments, env) Get a list of environments environment:logs (log) Read an environment's logs environment:merge (merge) Merge an environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/dist/manifest.json new/platformsh-cli-3.40.11/dist/manifest.json --- old/platformsh-cli-3.40.8/dist/manifest.json 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/dist/manifest.json 2019-04-04 15:23:21.000000000 +0200 @@ -1,10 +1,10 @@ [ { "name": "platform.phar", - "sha1": "6a6f08bfc6107771d0ff29aba7316ab685f65ea6", - "sha256": "8bab401f25d1908ee6741c7b8c2699ca3ec09d3ebe7cdadc4fb2f837f85efb63", - "url": "https://github.com/platformsh/platformsh-cli/releases/download/v3.40.8/platf...", - "version": "3.40.8", + "sha1": "21009f6ecce6ef643f78fe1ea0cffb100d70a6a8", + "sha256": "00d61de403085c4585937fe4264cb4b7a66c066447ea71d15f74805a62953984", + "url": "https://github.com/platformsh/platformsh-cli/releases/download/v3.40.11/plat...", + "version": "3.40.11", "php": { "min": "5.5.9" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/Application.php new/platformsh-cli-3.40.11/src/Application.php --- old/platformsh-cli-3.40.8/src/Application.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/Application.php 2019-04-04 15:23:21.000000000 +0200 @@ -33,7 +33,7 @@ public function __construct() { $this->cliConfig = new Config(); - parent::__construct($this->cliConfig->get('application.name'), $this->cliConfig->get('application.version')); + parent::__construct($this->cliConfig->get('application.name'), $this->cliConfig->getVersion()); // Use the configured timezone, or fall back to the system timezone. date_default_timezone_set( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/Command/Environment/EnvironmentInitCommand.php new/platformsh-cli-3.40.11/src/Command/Environment/EnvironmentInitCommand.php --- old/platformsh-cli-3.40.8/src/Command/Environment/EnvironmentInitCommand.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/Command/Environment/EnvironmentInitCommand.php 2019-04-04 15:23:21.000000000 +0200 @@ -9,8 +9,6 @@ class EnvironmentInitCommand extends CommandBase { - protected $hiddenInList = true; - /** * {@inheritdoc} */ @@ -18,13 +16,22 @@ { $this ->setName('environment:init') + ->setDescription('Initialize an environment from a public Git repository') ->addArgument('url', InputArgument::REQUIRED, 'A URL to a Git repository') ->addOption('profile', null, InputOption::VALUE_REQUIRED, 'The name of the profile'); + + if ($this->config()->get('service.name') === 'Platform.sh') { + $this->addExample('Initialize using the Platform.sh Go template', 'https://github.com/platformsh/template-golang'); + } + $this->addProjectOption() ->addEnvironmentOption() ->addWaitOptions(); } + /** + * {@inheritdoc} + */ protected function execute(InputInterface $input, OutputInterface $output) { $this->validateInput($input, true); @@ -56,6 +63,19 @@ return 1; } + // Summarize this action with a message. + $message = 'Initializing project '; + $message .= $this->api()->getProjectLabel($this->getSelectedProject()); + if ($environment->id !== 'master') { + $message .= ', environment ' . $this->api()->getEnvironmentLabel($environment); + } + if ($input->getOption('profile')) { + $message .= ' with profile <info>' . $profile . '</info> (' . $url . ')'; + } else { + $message .= ' with repository <info>' . $url . '</info>.'; + } + $this->stdErr->writeln($message); + $activity = $environment->initialize($profile, $url); $this->api()->clearEnvironmentsCache($environment->project); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/Command/Local/LocalDrushAliasesCommand.php new/platformsh-cli-3.40.11/src/Command/Local/LocalDrushAliasesCommand.php --- old/platformsh-cli-3.40.8/src/Command/Local/LocalDrushAliasesCommand.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/Command/Local/LocalDrushAliasesCommand.php 2019-04-04 15:23:21.000000000 +0200 @@ -106,7 +106,7 @@ /** @var \Platformsh\Cli\Service\RemoteEnvVars $envVarsService */ $envVarsService = $this->getService('remote_env_vars'); foreach ($environments as $environment) { - if ($environment->deployment_target !== 'enterprise') { + if ($environment->deployment_target === 'local') { continue; } foreach ($apps as $app) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/Command/MultiCommand.php new/platformsh-cli-3.40.11/src/Command/MultiCommand.php --- old/platformsh-cli-3.40.8/src/Command/MultiCommand.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/Command/MultiCommand.php 2019-04-04 15:23:21.000000000 +0200 @@ -190,9 +190,15 @@ foreach ($this->splitProjectList($projectList) as $projectId) { try { $result = $identifier->identify($projectId); - $selected[$result['projectId']] = $this->api()->getProject($result['projectId'], $result['host']); } catch (InvalidArgumentException $e) { $missing[] = $projectId; + continue; + } + $project = $this->api()->getProject($result['projectId'], $result['host']); + if ($project !== false) { + $selected[$project->id] = $project; + } else { + $missing[] = $projectId; } } if (!empty($missing)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/Command/Self/SelfBuildCommand.php new/platformsh-cli-3.40.11/src/Command/Self/SelfBuildCommand.php --- old/platformsh-cli-3.40.8/src/Command/Self/SelfBuildCommand.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/Command/Self/SelfBuildCommand.php 2019-04-04 15:23:21.000000000 +0200 @@ -56,7 +56,7 @@ /** @var \Platformsh\Cli\Service\QuestionHelper $questionHelper */ $questionHelper = $this->getService('question_helper'); - $version = $this->config()->get('application.version'); + $version = $this->config()->getVersion(); if ($input->getOption('replace-version')) { $version = $input->getOption('replace-version'); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/Command/Self/SelfReleaseCommand.php new/platformsh-cli-3.40.11/src/Command/Self/SelfReleaseCommand.php --- old/platformsh-cli-3.40.8/src/Command/Self/SelfReleaseCommand.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/Command/Self/SelfReleaseCommand.php 2019-04-04 15:23:21.000000000 +0200 @@ -28,7 +28,7 @@ ->addOption('manifest-mode', null, InputOption::VALUE_REQUIRED, 'How to update the manifest file', 'update-latest') ->addOption('release-branch', null, InputOption::VALUE_REQUIRED, 'Override the release branch', $defaultReleaseBranch) ->addOption('last-version', null, InputOption::VALUE_REQUIRED, 'The last version number') - ->addOption('no-check-changes', null, InputOption::VALUE_NONE, 'Skip check for uncommitted changes') + ->addOption('no-check-changes', null, InputOption::VALUE_NONE, 'Skip check for uncommitted changes, or no change since the last version') ->addOption('allow-lower', null, InputOption::VALUE_NONE, 'Allow releasing with a lower version number than the last'); } @@ -56,21 +56,18 @@ $releaseBranch = $input->getOption('release-branch'); if ($git->getCurrentBranch(CLI_ROOT, true) !== $releaseBranch) { $this->stdErr->writeln('You must be on the ' . $releaseBranch . ' branch to make a release.'); + $this->stdErr->writeln('Check out master, or use the --release-branch option to override this.'); return 1; } - $developmentDiffStat = $git->execute(['diff', '--numstat', $releaseBranch . '...development'], CLI_ROOT); - if (is_string($developmentDiffStat) && strlen(trim($developmentDiffStat)) && $questionHelper->confirm('Merge changes from development?')) { - $git->execute(['merge', 'development'], CLI_ROOT, true); - } - if (!$input->getOption('no-check-changes')) { $gitStatus = $git->execute(['status', '--porcelain'], CLI_ROOT, true); if (is_string($gitStatus) && !empty($gitStatus)) { foreach (explode("\n", $gitStatus) as $statusLine) { if (strpos($statusLine, ' config.yaml') === false) { $this->stdErr->writeln('There are uncommitted changes in Git. Cannot proceed.'); + $this->stdErr->writeln('Use the --no-check-changes option to override this.'); return 1; } @@ -98,12 +95,22 @@ $this->stdErr->writeln('Last version number (from latest Git tag): <info>' . $lastVersion . '</info>'); } - $validateNewVersion = function ($next) use ($lastVersion) { + if (!$input->getOption('no-check-changes') && !$this->hasGitDifferences($lastTag)) { + $this->stdErr->writeln('There are no changes since the last version.'); + + return 1; + } + + $allowLower = (bool) $input->getOption('allow-lower'); + $validateNewVersion = function ($next) use ($lastVersion, $allowLower) { if ($next === null) { throw new \InvalidArgumentException('The new version is required.'); } - if (version_compare($next, $lastVersion, '<=')) { - throw new \InvalidArgumentException('The new version number must be greater than ' . $lastVersion); + if (!$allowLower && version_compare($next, $lastVersion, '<=')) { + throw new \InvalidArgumentException( + 'The new version number must be greater than ' . $lastVersion + . "\n" . 'Use --allow-lower to skip this check.' + ); } return $next; @@ -210,14 +217,6 @@ throw new \RuntimeException('Unrecognised --manifest-mode: ' . $input->getOption('manifest-mode')); } - // Validate the new version number against the previous version. - if (version_compare($newVersion, $lastVersion, '<') && !$input->getOption('allow-lower')) { - $this->stdErr->writeln(sprintf('The new version number <error>%s</error> is lower than the last version number <error>%s</error>.', $newVersion, $lastVersion)); - $this->stdErr->writeln('Use --allow-lower to skip this check.'); - - return 1; - } - // Confirm the release changelog. $changelog = $this->getReleaseChangelog($lastTag); $questionText = "\nChangelog:\n\n" . $changelog . "\n\nIs this changelog correct?"; @@ -319,9 +318,8 @@ $releaseDescription = sprintf('Changes since [%s](%s):', $lastTag, $lastReleasePublicUrl); if (!empty($changelog)) { $releaseDescription .= "\n\n" . $changelog; - } else { - $releaseDescription .= "\n\n" . 'https://github.com/' . $repoUrl . '/compare/' . $lastTag . '...' . $tagName; } + $releaseDescription .= "\n\n" . 'https://github.com/' . $repoUrl . '/compare/' . $lastTag . '...' . $tagName; $releaseDescription .= "\n\n" . sprintf('SHA-256 checksum for `%s`:', $pharPublicFilename) . "\n" . sprintf('`%s`', hash_file('sha256', $pharFilename)); $this->stdErr->writeln(''); @@ -427,6 +425,32 @@ } /** + * Checks if there are relevant Git differences since the last version. + * + * @param string $since + * + * @return bool + */ + private function hasGitDifferences($since) + { + /** @var \Platformsh\Cli\Service\Git $git */ + $git = $this->getService('git'); + $stat = $git->execute(['diff', '--numstat', $since . '...HEAD'], CLI_ROOT, true); + if (!is_string($stat)) { + return false; + } + + foreach (explode("\n", trim($stat)) as $line) { + // Exclude config.yaml and dist/manifest.json from the check. + if (strpos($line, ' config.yaml') === false && strpos($line, ' dist/manifest.json') === false) { + return true; + } + } + + return false; + } + + /** * @param string $since * * @return string diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/Command/Self/SelfUpdateCommand.php new/platformsh-cli-3.40.11/src/Command/Self/SelfUpdateCommand.php --- old/platformsh-cli-3.40.8/src/Command/Self/SelfUpdateCommand.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/Command/Self/SelfUpdateCommand.php 2019-04-04 15:23:21.000000000 +0200 @@ -25,7 +25,7 @@ protected function execute(InputInterface $input, OutputInterface $output) { $manifestUrl = $input->getOption('manifest') ?: $this->config()->get('application.manifest_url'); - $currentVersion = $input->getOption('current-version') ?: $this->config()->get('application.version'); + $currentVersion = $input->getOption('current-version') ?: $this->config()->getVersion(); /** @var \Platformsh\Cli\Service\SelfUpdater $cliUpdater */ $cliUpdater = $this->getService('self_updater'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/Service/Api.php new/platformsh-cli-3.40.11/src/Service/Api.php --- old/platformsh-cli-3.40.8/src/Service/Api.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/Service/Api.php 2019-04-04 15:23:21.000000000 +0200 @@ -160,7 +160,7 @@ return sprintf( '%s/%s (%s; %s; PHP %s)', str_replace(' ', '-', $this->config->get('application.name')), - $this->config->get('application.version'), + $this->config->getVersion(), php_uname('s'), php_uname('r'), PHP_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/Service/Config.php new/platformsh-cli-3.40.11/src/Service/Config.php --- old/platformsh-cli-3.40.8/src/Service/Config.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/Service/Config.php 2019-04-04 15:23:21.000000000 +0200 @@ -18,6 +18,8 @@ private $fs; + private $version; + /** * @param array|null $env * @param string|null $defaultsFile @@ -297,4 +299,26 @@ return true; } + + /** + * Returns this application version. + * + * @return string + */ + public function getVersion() { + if (isset($this->version)) { + return $this->version; + } + $version = $this->get('application.version'); + if (substr($version, 0, 1) === '@' && substr($version, -1) === '@') { + // Silently try getting the version from Git. + $tag = (new Shell())->execute(['git', 'describe', '--tags'], CLI_ROOT); + if ($tag !== false && substr($tag, 0, 1) === 'v') { + $version = trim($tag); + } + } + $this->version = $version; + + return $version; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/Service/SelfUpdater.php new/platformsh-cli-3.40.11/src/Service/SelfUpdater.php --- old/platformsh-cli-3.40.8/src/Service/SelfUpdater.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/Service/SelfUpdater.php 2019-04-04 15:23:21.000000000 +0200 @@ -84,7 +84,7 @@ */ public function update($manifestUrl = null, $currentVersion = null) { - $currentVersion = $currentVersion ?: $this->config->get('application.version'); + $currentVersion = $currentVersion ?: $this->config->getVersion(); $manifestUrl = $manifestUrl ?: $this->config->get('application.manifest_url'); $applicationName = $this->config->get('application.name'); if (!extension_loaded('Phar') || !($localPhar = \Phar::running(false))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/src/SiteAlias/DrushAlias.php new/platformsh-cli-3.40.11/src/SiteAlias/DrushAlias.php --- old/platformsh-cli-3.40.8/src/SiteAlias/DrushAlias.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/src/SiteAlias/DrushAlias.php 2019-04-04 15:23:21.000000000 +0200 @@ -250,7 +250,7 @@ // For most environments, we know the application root directory is // '/app'. It's different in Enterprise environments. - if ($environment->deployment_target === 'enterprise') { + if ($environment->deployment_target !== 'local') { $appRoot = $this->drush->getCachedAppRoot($sshUrl); if ($appRoot) { $alias['root'] = rtrim($appRoot, '/') . '/' . $app->getDocumentRoot(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.8/tests/Service/IdentifierTest.php new/platformsh-cli-3.40.11/tests/Service/IdentifierTest.php --- old/platformsh-cli-3.40.8/tests/Service/IdentifierTest.php 2019-03-30 22:53:45.000000000 +0100 +++ new/platformsh-cli-3.40.11/tests/Service/IdentifierTest.php 2019-04-04 15:23:21.000000000 +0200 @@ -56,7 +56,7 @@ ]; $this->assertEquals($expected, $identifier->identify($url)); - $url = 'https://ui.platform.sh/foo/4jkbdba6zde2i'; + $url = 'https://console.platform.sh/foo/4jkbdba6zde2i'; $expected = [ 'projectId' => '4jkbdba6zde2i', 'environmentId' => null, @@ -65,7 +65,7 @@ ]; $this->assertEquals($expected, $identifier->identify($url)); - $url = 'https://ui.platform.sh/foo/4jkbdba6zde2i/bar'; + $url = 'https://console.platform.sh/foo/4jkbdba6zde2i/bar'; $expected = [ 'projectId' => '4jkbdba6zde2i', 'environmentId' => 'bar', @@ -88,7 +88,7 @@ ]; $this->assertEquals($expected, $identifier->identify($url)); - $url = 'https://ui.platform.sh/foo/4jkbdba6zde2i/0'; + $url = 'https://console.platform.sh/foo/4jkbdba6zde2i/0'; $expected = [ 'projectId' => '4jkbdba6zde2i', 'environmentId' => '0', ++++++ platformsh-cli-vendor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/autoload.php new/vendor/autoload.php --- old/vendor/autoload.php 2019-04-02 01:54:34.718484000 +0200 +++ new/vendor/autoload.php 2019-04-05 16:46:00.818200715 +0200 @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitc94a9537a545552e0a92560e613ef7b3::getLoader(); +return ComposerAutoloaderInit0b2b3c3bfa3add2029d93a2fa3570ed8::getLoader(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_real.php new/vendor/composer/autoload_real.php --- old/vendor/composer/autoload_real.php 2019-04-02 01:54:34.718484000 +0200 +++ new/vendor/composer/autoload_real.php 2019-04-05 16:46:00.818200715 +0200 @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitc94a9537a545552e0a92560e613ef7b3 +class ComposerAutoloaderInit0b2b3c3bfa3add2029d93a2fa3570ed8 { private static $loader; @@ -19,15 +19,15 @@ return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitc94a9537a545552e0a92560e613ef7b3', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit0b2b3c3bfa3add2029d93a2fa3570ed8', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitc94a9537a545552e0a92560e613ef7b3', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit0b2b3c3bfa3add2029d93a2fa3570ed8', '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\ComposerStaticInitc94a9537a545552e0a92560e613ef7b3::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit0b2b3c3bfa3add2029d93a2fa3570ed8::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitc94a9537a545552e0a92560e613ef7b3::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit0b2b3c3bfa3add2029d93a2fa3570ed8::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirec94a9537a545552e0a92560e613ef7b3($fileIdentifier, $file); + composerRequire0b2b3c3bfa3add2029d93a2fa3570ed8($fileIdentifier, $file); } return $loader; } } -function composerRequirec94a9537a545552e0a92560e613ef7b3($fileIdentifier, $file) +function composerRequire0b2b3c3bfa3add2029d93a2fa3570ed8($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_static.php new/vendor/composer/autoload_static.php --- old/vendor/composer/autoload_static.php 2019-04-02 01:54:34.718484000 +0200 +++ new/vendor/composer/autoload_static.php 2019-04-05 16:46:00.818200715 +0200 @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitc94a9537a545552e0a92560e613ef7b3 +class ComposerStaticInit0b2b3c3bfa3add2029d93a2fa3570ed8 { public static $files = array ( '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', @@ -201,9 +201,9 @@ public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitc94a9537a545552e0a92560e613ef7b3::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitc94a9537a545552e0a92560e613ef7b3::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitc94a9537a545552e0a92560e613ef7b3::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit0b2b3c3bfa3add2029d93a2fa3570ed8::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit0b2b3c3bfa3add2029d93a2fa3570ed8::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit0b2b3c3bfa3add2029d93a2fa3570ed8::$classMap; }, null, ClassLoader::class); }