fabbot

weaverryan · weaverryan · commit 45e93eee98b0 · 2023-10-05T11:04:20.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -3173,6 +3173,6 @@ private function getPublicDirectory(ContainerBuilder $container): string
         $container->addResource(new FileResource($composerFilePath));
         $composerConfig = json_decode(file_get_contents($composerFilePath), true);
 
-        return isset($composerConfig['extra']['public-dir']) ? $projectDir . '/' . $composerConfig['extra']['public-dir'] : $defaultPublicDir;
+        return isset($composerConfig['extra']['public-dir']) ? $projectDir.'/'.$composerConfig['extra']['public-dir'] : $defaultPublicDir;
     }
 }
diff --git a/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php b/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php
@@ -17,14 +17,11 @@
 use Symfony\Component\AssetMapper\Event\PreAssetsCompileEvent;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\AssetMapper\Path\PublicAssetsFilesystemInterface;
-use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolverInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -93,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if ($this->isDebug) {
             $io->warning(sprintf(
                 'You are compiling assets in development. Symfony will not serve any changed assets until you delete the files in the "%s" directory.',
-                $this->shortenPath(dirname($manifestPath))
+                $this->shortenPath(\dirname($manifestPath))
             ));
         }
 
diff --git a/src/Symfony/Component/AssetMapper/CompiledAssetMapperConfigReader.php b/src/Symfony/Component/AssetMapper/CompiledAssetMapperConfigReader.php
@@ -33,7 +33,7 @@ public function loadConfig(string $filename): array
     public function saveConfig(string $filename, array $data): string
     {
         $path = $this->directory.'/'.$filename;
-        @mkdir(dirname($path), 0777, true);
+        @mkdir(\dirname($path), 0777, true);
         file_put_contents($path, json_encode($data, \JSON_PRETTY_PRINT | \JSON_THROW_ON_ERROR));
 
         return $path;
diff --git a/src/Symfony/Component/AssetMapper/Tests/CompiledAssetMapperConfigReaderTest.php b/src/Symfony/Component/AssetMapper/Tests/CompiledAssetMapperConfigReaderTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\AssetMapper\Tests;
 
 use PHPUnit\Framework\TestCase;
diff --git a/src/Symfony/Component/AssetMapper/Tests/Path/LocalPublicAssetsFilesystemTest.php b/src/Symfony/Component/AssetMapper/Tests/Path/LocalPublicAssetsFilesystemTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\AssetMapper\Tests\Path;
 
 use PHPUnit\Framework\TestCase;

Original file line number	Diff line number	Diff line change
`@@ -3173,6 +3173,6 @@ private function getPublicDirectory(ContainerBuilder $container): string`
`3173`	`3173`	`$container->addResource(new FileResource($composerFilePath));`
`3174`	`3174`	`$composerConfig = json_decode(file_get_contents($composerFilePath), true);`
`3175`	`3175`
`3176`		`- return isset($composerConfig['extra']['public-dir']) ? $projectDir . '/' . $composerConfig['extra']['public-dir'] : $defaultPublicDir;`
	`3176`	`+ return isset($composerConfig['extra']['public-dir']) ? $projectDir.'/'.$composerConfig['extra']['public-dir'] : $defaultPublicDir;`
`3177`	`3177`	`}`
`3178`	`3178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function loadConfig(string $filename): array`
`33`	`33`	`public function saveConfig(string $filename, array $data): string`
`34`	`34`	`{`
`35`	`35`	`$path = $this->directory.'/'.$filename;`
`36`		`- @mkdir(dirname($path), 0777, true);`
	`36`	`+ @mkdir(\dirname($path), 0777, true);`
`37`	`37`	`file_put_contents($path, json_encode($data, \JSON_PRETTY_PRINT \| \JSON_THROW_ON_ERROR));`
`38`	`38`
`39`	`39`	`return $path;`