diff --git a/.travis.yml b/.travis.yml index 46b252e..c9c4267 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,8 @@ matrix: before_script: - composer validate - composer install --dev --prefer-dist - - composer require --update-with-dependencies silverstripe/framework:4.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/config:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev --prefer-dist + - composer require --prefer-dist --no-update symfony/config:^3.2 silverstripe/framework:4.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/config:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev --prefer-dist + - composer update - if [[ $PHPCS_TEST ]]; then pyrus install pear/PHP_CodeSniffer; fi - phpenv rehash diff --git a/src/Compiler/CoreInitializationPass.php b/src/Compiler/CoreInitializationPass.php index fd9e915..3b58c87 100644 --- a/src/Compiler/CoreInitializationPass.php +++ b/src/Compiler/CoreInitializationPass.php @@ -32,7 +32,7 @@ class CoreInitializationPass implements CompilerPassInterface } // Register all paths - foreach (ModuleLoader::instance()->getManifest()->getModules() as $module) { + foreach (ModuleLoader::inst()->getManifest()->getModules() as $module) { $container->setParameter('paths.modules.'.$module->getShortName(), $module->getPath()); $composerName = $module->getComposerName(); if ($composerName) { diff --git a/src/Controllers/ModuleCommandTrait.php b/src/Controllers/ModuleCommandTrait.php index 965affd..3c30d3f 100644 --- a/src/Controllers/ModuleCommandTrait.php +++ b/src/Controllers/ModuleCommandTrait.php @@ -19,7 +19,7 @@ trait ModuleCommandTrait if (strpos($name, '@') === 0) { $name = substr($name, 1); } - $module = ModuleLoader::instance()->getManifest()->getModule($name); + $module = ModuleLoader::inst()->getManifest()->getModule($name); if (!$module) { throw new InvalidArgumentException("No module $name installed"); }