Commit a4801ce9 authored by Nedjo Rogers's avatar Nedjo Rogers
Browse files

Issue #3224696: fix remaining app.root calls

parent 89f41f49

src/Plugin/FeaturesGeneration/FeaturesGenerationArchive.php

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ class FeaturesGenerationArchive extends FeaturesGenerationMethodBase implements 
   */

  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {

    return new static(

      $container->get('app.root'),

      $container->getParameter('app.root'),

      $container->get('csrf_token'),

      $container->get('file_system')

    );

src/Plugin/FeaturesGeneration/FeaturesGenerationWrite.php

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class FeaturesGenerationWrite extends FeaturesGenerationMethodBase implements Co 
   */

  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {

    return new static(

      $container->get('app.root'),

      $container->getParameter('app.root'),

      $container->get('file_system')

    );

  }

tests/src/Kernel/FeaturesGenerateTest.php

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ class FeaturesGenerateTest extends KernelTestBase { 
  public function testExportWrite() {

    // Set a fake drupal root, so the testbot can also write into it.

    vfsStream::setup('drupal');

    \Drupal::getContainer()->set('app.root', 'vfs://drupal');

    \Drupal::getContainer()->setParameter('app.root', 'vfs://drupal');

    $this->featuresManager->setRoot('vfs://drupal');



    $package = $this->featuresManager->getPackage(self::PACKAGE_NAME);

tests/src/Unit/FeaturesManagerTest.php

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ class FeaturesManagerTest extends UnitTestCase { 


    $container = new ContainerBuilder();

    $container->set('string_translation', $this->getStringTranslationStub());

    $container->set('app.root', $this->root);

    $container->setParameter('app.root', $this->root);

    // Since in Drupal 8.3 the "\Drupal::installProfile()" was introduced

    // then we have to spoof a value for the "install_profile" parameter

    // because it will be used by "ExtensionInstallStorage" class, which
@@ -165,7 +165,7 @@ class FeaturesManagerTest extends UnitTestCase { 


  protected function setupVfsWithTestFeature() {

    vfsStream::setup('drupal');

    \Drupal::getContainer()->set('app.root', 'vfs://drupal');

    \Drupal::getContainer()->setParameter('app.root', 'vfs://drupal');

    vfsStream::create([

      'modules' => [

        'test_feature' => [