gravityview / GravityView

vendor/brianhenryie/strauss/tests/Issues/MozartIssue93Test.php

Indentation +26 added lines, -26 removed lines

@@ -17,21 +17,21 @@ 
  */
 class MozartIssue93Test extends IntegrationTestCase
 {
-    /**
-     * Issue #93 shows a classname being updated inside a class whose namespace has also been updated
-     * by Mozart.
-     *
-     * This is caused by the same files being loaded by both a PSR-4 autolaoder and classmap autoloader.
-     * @see https://github.com/katzgrau/KLogger/blob/de2d3ab6777a393a9879e0496ebb8e0644066e3f/composer.json#L24-L29
-     *
-     * @author BrianHenryIE
-     */
-    public function test_it_does_not_make_classname_replacement_inside_namespaced_file()
-    {
+	/**
+	 * Issue #93 shows a classname being updated inside a class whose namespace has also been updated
+	 * by Mozart.
+	 *
+	 * This is caused by the same files being loaded by both a PSR-4 autolaoder and classmap autoloader.
+	 * @see https://github.com/katzgrau/KLogger/blob/de2d3ab6777a393a9879e0496ebb8e0644066e3f/composer.json#L24-L29
+	 *
+	 * @author BrianHenryIE
+	 */
+	public function test_it_does_not_make_classname_replacement_inside_namespaced_file()
+	{
 
-        $this->markTestSkipped('Not respecting the pinned commit.');
+		$this->markTestSkipped('Not respecting the pinned commit.');
 
-        $composerJsonString = <<<'EOD'
+		$composerJsonString = <<<'EOD'
 {
 	"name": "brianhenryie/mozart-issue-93",
 	"repositories": [{
@@ -51,25 +51,25 @@ 
 }
 EOD;
 
-        file_put_contents($this->testsWorkingDir . '/composer.json', $composerJsonString);
+		file_put_contents($this->testsWorkingDir . '/composer.json', $composerJsonString);
 
-        chdir($this->testsWorkingDir);
+		chdir($this->testsWorkingDir);
 
-        exec('composer install');
+		exec('composer install');
 
-        $inputInterfaceMock = $this->createMock(InputInterface::class);
-        $outputInterfaceMock = $this->createMock(OutputInterface::class);
+		$inputInterfaceMock = $this->createMock(InputInterface::class);
+		$outputInterfaceMock = $this->createMock(OutputInterface::class);
 
-        $mozartCompose = new Compose();
+		$mozartCompose = new Compose();
 
-        $mozartCompose->run($inputInterfaceMock, $outputInterfaceMock);
+		$mozartCompose->run($inputInterfaceMock, $outputInterfaceMock);
 
-        $php_string = file_get_contents($this->testsWorkingDir .'strauss/brianhenryie/wp-logger/src/class-logger.php');
+		$php_string = file_get_contents($this->testsWorkingDir .'strauss/brianhenryie/wp-logger/src/class-logger.php');
 
-        // Confirm problem is gone.
-        $this->assertStringNotContainsString('class BrianHenryIE_Strauss_Logger extends', $php_string);
+		// Confirm problem is gone.
+		$this->assertStringNotContainsString('class BrianHenryIE_Strauss_Logger extends', $php_string);
 
-        // Confirm solution is correct.
-        $this->assertStringContainsString('class Logger extends', $php_string);
-    }
+		// Confirm solution is correct.
+		$this->assertStringContainsString('class Logger extends', $php_string);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
     public function test_it_does_not_make_classname_replacement_inside_namespaced_file()
     {
 
-        $this->markTestSkipped('Not respecting the pinned commit.');
+        $this->markTestSkipped( 'Not respecting the pinned commit.' );
 
         $composerJsonString = <<<'EOD'
 {
@@ -51,25 +51,25 @@ 
 }
 EOD;
 
-        file_put_contents($this->testsWorkingDir . '/composer.json', $composerJsonString);
+        file_put_contents( $this->testsWorkingDir . '/composer.json', $composerJsonString );
 
-        chdir($this->testsWorkingDir);
+        chdir( $this->testsWorkingDir );
 
-        exec('composer install');
+        exec( 'composer install' );
 
-        $inputInterfaceMock = $this->createMock(InputInterface::class);
-        $outputInterfaceMock = $this->createMock(OutputInterface::class);
+        $inputInterfaceMock = $this->createMock( InputInterface::class );
+        $outputInterfaceMock = $this->createMock( OutputInterface::class );
 
         $mozartCompose = new Compose();
 
-        $mozartCompose->run($inputInterfaceMock, $outputInterfaceMock);
+        $mozartCompose->run( $inputInterfaceMock, $outputInterfaceMock );
 
-        $php_string = file_get_contents($this->testsWorkingDir .'strauss/brianhenryie/wp-logger/src/class-logger.php');
+        $php_string = file_get_contents( $this->testsWorkingDir . 'strauss/brianhenryie/wp-logger/src/class-logger.php' );
 
         // Confirm problem is gone.
-        $this->assertStringNotContainsString('class BrianHenryIE_Strauss_Logger extends', $php_string);
+        $this->assertStringNotContainsString( 'class BrianHenryIE_Strauss_Logger extends', $php_string );
 
         // Confirm solution is correct.
-        $this->assertStringContainsString('class Logger extends', $php_string);
+        $this->assertStringContainsString( 'class Logger extends', $php_string );
     }
 }

Braces +2 added lines, -4 removed lines

@@ -15,8 +15,7 @@ 
  * Class MozartIssue93Test
  * @coversNothing
  */
-class MozartIssue93Test extends IntegrationTestCase
-{
+class MozartIssue93Test extends IntegrationTestCase {
     /**
      * Issue #93 shows a classname being updated inside a class whose namespace has also been updated
      * by Mozart.
@@ -26,8 +25,7 @@ 
      *
      * @author BrianHenryIE
      */
-    public function test_it_does_not_make_classname_replacement_inside_namespaced_file()
-    {
+    public function test_it_does_not_make_classname_replacement_inside_namespaced_file() {
 
         $this->markTestSkipped('Not respecting the pinned commit.');
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	},
 	"minimum-stability": "dev"
 }
-EOD;
+eod;
 
         file_put_contents($this->testsWorkingDir . '/composer.json', $composerJsonString);
 

vendor/brianhenryie/strauss/tests/Issues/MozartIssue43Test.php

Indentation +19 added lines, -19 removed lines

@@ -21,17 +21,17 @@ 
 class MozartIssue43Test extends IntegrationTestCase
 {
 
-    /**
-     * Issue 43. Needs "aws/aws-sdk-php".
-     *
-     * League\Flysystem\FileExistsException : File already exists at path:
-     * dep_directory/vendor/guzzle/guzzle/src/Guzzle/Cache/Zf1CacheAdapter.php
-     */
-    public function testAwsSdkSucceeds()
-    {
-        $this->markTestSkipped('Very slow to run');
+	/**
+	 * Issue 43. Needs "aws/aws-sdk-php".
+	 *
+	 * League\Flysystem\FileExistsException : File already exists at path:
+	 * dep_directory/vendor/guzzle/guzzle/src/Guzzle/Cache/Zf1CacheAdapter.php
+	 */
+	public function testAwsSdkSucceeds()
+	{
+		$this->markTestSkipped('Very slow to run');
 
-        $composerJsonString = <<<'EOD'
+		$composerJsonString = <<<'EOD'
 {
 	"name": "brianhenryie/mozart-issue-43",
 	"require": {
@@ -53,21 +53,21 @@ 
 }
 EOD;
 
-        file_put_contents($this->testsWorkingDir . '/composer.json', $composerJsonString);
+		file_put_contents($this->testsWorkingDir . '/composer.json', $composerJsonString);
 
-        chdir($this->testsWorkingDir);
+		chdir($this->testsWorkingDir);
 
-        exec('composer install');
+		exec('composer install');
 
-        $inputInterfaceMock = $this->createMock(InputInterface::class);
-        $outputInterfaceMock = $this->createMock(OutputInterface::class);
+		$inputInterfaceMock = $this->createMock(InputInterface::class);
+		$outputInterfaceMock = $this->createMock(OutputInterface::class);
 
-        $strauss = new Compose();
+		$strauss = new Compose();
 
-        $result = $strauss->run($inputInterfaceMock, $outputInterfaceMock);
+		$result = $strauss->run($inputInterfaceMock, $outputInterfaceMock);
 //
 //        $this->assertEquals(0, $result);
 
-        $this->assertFileExists($this->testsWorkingDir . '/strauss/aws/aws-sdk-php/src/AWS/Common/Aws.php');
-    }
+		$this->assertFileExists($this->testsWorkingDir . '/strauss/aws/aws-sdk-php/src/AWS/Common/Aws.php');
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function testAwsSdkSucceeds()
     {
-        $this->markTestSkipped('Very slow to run');
+        $this->markTestSkipped( 'Very slow to run' );
 
         $composerJsonString = <<<'EOD'
 {
@@ -53,21 +53,21 @@ 
 }
 EOD;
 
-        file_put_contents($this->testsWorkingDir . '/composer.json', $composerJsonString);
+        file_put_contents( $this->testsWorkingDir . '/composer.json', $composerJsonString );
 
-        chdir($this->testsWorkingDir);
+        chdir( $this->testsWorkingDir );
 
-        exec('composer install');
+        exec( 'composer install' );
 
-        $inputInterfaceMock = $this->createMock(InputInterface::class);
-        $outputInterfaceMock = $this->createMock(OutputInterface::class);
+        $inputInterfaceMock = $this->createMock( InputInterface::class );
+        $outputInterfaceMock = $this->createMock( OutputInterface::class );
 
         $strauss = new Compose();
 
-        $result = $strauss->run($inputInterfaceMock, $outputInterfaceMock);
+        $result = $strauss->run( $inputInterfaceMock, $outputInterfaceMock );
 //
 //        $this->assertEquals(0, $result);
 
-        $this->assertFileExists($this->testsWorkingDir . '/strauss/aws/aws-sdk-php/src/AWS/Common/Aws.php');
+        $this->assertFileExists( $this->testsWorkingDir . '/strauss/aws/aws-sdk-php/src/AWS/Common/Aws.php' );
     }
 }

Braces +2 added lines, -4 removed lines

@@ -18,8 +18,7 @@ 
  * @package BrianHenryIE\Strauss\Tests\Issues
  * @coversNothing
  */
-class MozartIssue43Test extends IntegrationTestCase
-{
+class MozartIssue43Test extends IntegrationTestCase {
 
     /**
      * Issue 43. Needs "aws/aws-sdk-php".
@@ -27,8 +26,7 @@ 
      * League\Flysystem\FileExistsException : File already exists at path:
      * dep_directory/vendor/guzzle/guzzle/src/Guzzle/Cache/Zf1CacheAdapter.php
      */
-    public function testAwsSdkSucceeds()
-    {
+    public function testAwsSdkSucceeds() {
         $this->markTestSkipped('Very slow to run');
 
         $composerJsonString = <<<'EOD'

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 		}
 	}
 }
-EOD;
+eod;
 
         file_put_contents($this->testsWorkingDir . '/composer.json', $composerJsonString);
 

vendor/brianhenryie/strauss/src/Copier.php

Indentation +68 added lines, -68 removed lines

@@ -19,72 +19,72 @@
 
 class Copier
 {
-    /**
-     * The only path variable with a leading slash.
-     * All directories in project end with a slash.
-     *
-     * @var string
-     */
-    protected string $workingDir;
-
-    protected string $targetDir;
-
-    protected array $filepaths;
-
-    /** @var Filesystem */
-    protected Filesystem $filesystem;
-
-    /**
-     * Copier constructor.
-     * @param array<string, ComposerPackage> $filepaths
-     * @param string $workingDir
-     * @param string $relativeTargetDir
-     */
-    public function __construct(array $filepaths, string $workingDir, string $relativeTargetDir)
-    {
-        $this->filepaths = array_keys($filepaths);
-
-        $this->workingDir = $workingDir;
-
-        $this->targetDir = $relativeTargetDir;
-
-        $this->filesystem = new Filesystem(new Local($this->workingDir));
-    }
-
-    /**
-     * If the target dir does not exist, create it.
-     * If it already exists, delete any files we're about to copy.
-     *
-     * @return void
-     */
-    public function prepareTarget(): void
-    {
-        if (! $this->filesystem->has($this->targetDir)) {
-            $this->filesystem->createDir($this->targetDir);
-        } else {
-            foreach ($this->filepaths as $vendorRelativeFilepath) {
-                $projectRelativeFilepath = $this->targetDir . $vendorRelativeFilepath;
-
-                if ($this->filesystem->has($projectRelativeFilepath)) {
-                    $this->filesystem->delete($projectRelativeFilepath);
-                }
-            }
-        }
-    }
-
-
-    /**
-     *
-     */
-    public function copy(): void
-    {
-
-        foreach ($this->filepaths as $relativeFilepath) {
-            $sourceFileRelativePath = 'vendor' . DIRECTORY_SEPARATOR . $relativeFilepath;
-
-            $targetFileRelativePath = $this->targetDir . $relativeFilepath;
-
-            $this->filesystem->copy($sourceFileRelativePath, $targetFileRelativePath);
-        }
-    }
+	/**
+	 * The only path variable with a leading slash.
+	 * All directories in project end with a slash.
+	 *
+	 * @var string
+	 */
+	protected string $workingDir;
+
+	protected string $targetDir;
+
+	protected array $filepaths;
+
+	/** @var Filesystem */
+	protected Filesystem $filesystem;
+
+	/**
+	 * Copier constructor.
+	 * @param array<string, ComposerPackage> $filepaths
+	 * @param string $workingDir
+	 * @param string $relativeTargetDir
+	 */
+	public function __construct(array $filepaths, string $workingDir, string $relativeTargetDir)
+	{
+		$this->filepaths = array_keys($filepaths);
+
+		$this->workingDir = $workingDir;
+
+		$this->targetDir = $relativeTargetDir;
+
+		$this->filesystem = new Filesystem(new Local($this->workingDir));
+	}
+
+	/**
+	 * If the target dir does not exist, create it.
+	 * If it already exists, delete any files we're about to copy.
+	 *
+	 * @return void
+	 */
+	public function prepareTarget(): void
+	{
+		if (! $this->filesystem->has($this->targetDir)) {
+			$this->filesystem->createDir($this->targetDir);
+		} else {
+			foreach ($this->filepaths as $vendorRelativeFilepath) {
+				$projectRelativeFilepath = $this->targetDir . $vendorRelativeFilepath;
+
+				if ($this->filesystem->has($projectRelativeFilepath)) {
+					$this->filesystem->delete($projectRelativeFilepath);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 *
+	 */
+	public function copy(): void
+	{
+
+		foreach ($this->filepaths as $relativeFilepath) {
+			$sourceFileRelativePath = 'vendor' . DIRECTORY_SEPARATOR . $relativeFilepath;
+
+			$targetFileRelativePath = $this->targetDir . $relativeFilepath;
+
+			$this->filesystem->copy($sourceFileRelativePath, $targetFileRelativePath);
+		}
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -40,15 +40,15 @@ 
      * @param string $workingDir
      * @param string $relativeTargetDir
      */
-    public function __construct(array $filepaths, string $workingDir, string $relativeTargetDir)
+    public function __construct( array $filepaths, string $workingDir, string $relativeTargetDir )
     {
-        $this->filepaths = array_keys($filepaths);
+        $this->filepaths = array_keys( $filepaths );
 
         $this->workingDir = $workingDir;
 
         $this->targetDir = $relativeTargetDir;
 
-        $this->filesystem = new Filesystem(new Local($this->workingDir));
+        $this->filesystem = new Filesystem( new Local( $this->workingDir ) );
     }
 
     /**
@@ -59,14 +59,14 @@ 
      */
     public function prepareTarget(): void
     {
-        if (! $this->filesystem->has($this->targetDir)) {
-            $this->filesystem->createDir($this->targetDir);
+        if ( ! $this->filesystem->has( $this->targetDir ) ) {
+            $this->filesystem->createDir( $this->targetDir );
         } else {
-            foreach ($this->filepaths as $vendorRelativeFilepath) {
+            foreach ( $this->filepaths as $vendorRelativeFilepath ) {
                 $projectRelativeFilepath = $this->targetDir . $vendorRelativeFilepath;
 
-                if ($this->filesystem->has($projectRelativeFilepath)) {
-                    $this->filesystem->delete($projectRelativeFilepath);
+                if ( $this->filesystem->has( $projectRelativeFilepath ) ) {
+                    $this->filesystem->delete( $projectRelativeFilepath );
                 }
             }
         }
@@ -79,12 +79,12 @@ 
     public function copy(): void
     {
 
-        foreach ($this->filepaths as $relativeFilepath) {
+        foreach ( $this->filepaths as $relativeFilepath ) {
             $sourceFileRelativePath = 'vendor' . DIRECTORY_SEPARATOR . $relativeFilepath;
 
             $targetFileRelativePath = $this->targetDir . $relativeFilepath;
 
-            $this->filesystem->copy($sourceFileRelativePath, $targetFileRelativePath);
+            $this->filesystem->copy( $sourceFileRelativePath, $targetFileRelativePath );
         }
     }
 }

Braces +2 added lines, -4 removed lines

@@ -17,8 +17,7 @@ 
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\Filesystem;
 
-class Copier
-{
+class Copier {
     /**
      * The only path variable with a leading slash.
      * All directories in project end with a slash.
@@ -40,8 +39,7 @@ 
      * @param string $workingDir
      * @param string $relativeTargetDir
      */
-    public function __construct(array $filepaths, string $workingDir, string $relativeTargetDir)
-    {
+    public function __construct(array $filepaths, string $workingDir, string $relativeTargetDir) {
         $this->filepaths = array_keys($filepaths);
 
         $this->workingDir = $workingDir;

vendor/brianhenryie/strauss/src/Composer/Extra/StraussConfig.php

Indentation +392 added lines, -392 removed lines

@@ -12,396 +12,396 @@
 
 class StraussConfig
 {
-    /**
-     * The output directory.
-     *
-     * Probably `strauss/` or `src/strauss/`.
-     *
-     * @var string
-     */
-    protected $targetDirectory = 'strauss';
-
-    /**
-     * `namespacePrefix` is the prefix to be given to any namespaces.
-     * Presumably this will take the form `My_Project_Namespace\dep_directory`.
-     *
-     * @link https://www.php-fig.org/psr/psr-4/
-     *
-     * @var string
-     */
-    protected $namespacePrefix;
-
-    /**
-     * @var string
-     */
-    protected $classmapPrefix;
-
-    /**
-     * Packages to copy and (maybe) prefix.
-     *
-     * If this is empty, the "requires" list in the project composer.json is used.
-     *
-     * @var array
-     */
-    protected array $packages = [];
-
-    // Back-compatibility with Mozart.
-    private array $excludePackages;
-
-    /**
-     * @var array{packages?: string[], namespaces?: string[], filePatterns?: string[]}
-     */
-    protected array $excludeFromCopy = array();
-
-    /**
-     * @var array{packages?: string[], namespaces?: string[], filePatterns?: string[]}
-     */
-    protected array $excludeFromPrefix = array('filePatterns'=>array('/^psr.*$/'));
-
-
-    /**
-     * An array of autoload keys to replace packages' existing autoload key.
-     *
-     * e.g. when
-     * * A package has no autoloader
-     * * A package specified both a PSR-4 and a classmap but only needs one
-     * ...
-     *
-     * @var array
-     */
-    protected $overrideAutoload = [];
-
-    /**
-     * After completing `strauss compose` should the source files be deleted?
-     * This does not affect symlinked directories.
-     *
-     * @var bool
-     */
-    protected $deleteVendorFiles = false;
-
-    protected bool $classmapOutput;
-
-    protected array $namespaceReplacementPatterns = array();
-
-
-    /**
-     * Read any existing Mozart config.
-     * Overwrite it with any Strauss config.
-     * Provide sensible defaults.
-     *
-     * @throws Exception
-     */
-    public function __construct(Composer $composer)
-    {
-
-        $configExtraSettings = null;
-
-        // Backwards compatibility with Mozart.
-        if (isset($composer->getPackage()->getExtra()['mozart'])) {
-            $configExtraSettings = (object)$composer->getPackage()->getExtra()['mozart'];
-
-            // Default setting for Mozart.
-            $this->setDeleteVendorFiles(true);
-        }
-
-        if (isset($composer->getPackage()->getExtra()['strauss'])) {
-            $configExtraSettings = (object)$composer->getPackage()->getExtra()['strauss'];
-        }
-
-        if (!is_null($configExtraSettings)) {
-            $mapper = (new JsonMapperFactory())->bestFit();
-
-            $rename = new Rename();
-            $rename->addMapping(StraussConfig::class, 'dep_directory', 'targetDirectory');
-            $rename->addMapping(StraussConfig::class, 'dep_namespace', 'namespacePrefix');
-
-            $rename->addMapping(StraussConfig::class, 'exclude_packages', 'excludePackages');
-            $rename->addMapping(StraussConfig::class, 'delete_vendor_directories', 'deleteVendorFiles');
-
-            $mapper->unshift($rename);
-            $mapper->push(new \JsonMapper\Middleware\CaseConversion(
-                \JsonMapper\Enums\TextNotation::UNDERSCORE(),
-                \JsonMapper\Enums\TextNotation::CAMEL_CASE()
-            ));
-
-            $mapper->mapObject($configExtraSettings, $this);
-        }
-
-        // Defaults.
-        // * Use PSR-4 autoloader key
-        // * Use PSR-0 autoloader key
-        // * Use the package name
-        if (! isset($this->namespacePrefix)) {
-            if (isset($composer->getPackage()->getAutoload()['psr-4'])) {
-                $this->setNamespacePrefix(array_key_first($composer->getPackage()->getAutoload()['psr-4']));
-            } elseif (isset($composer->getPackage()->getAutoload()['psr-0'])) {
-                $this->setNamespacePrefix(array_key_first($composer->getPackage()->getAutoload()['psr-0']));
-            } elseif ('__root__' !== $composer->getPackage()->getName()) {
-                $packageName = $composer->getPackage()->getName();
-                $namespacePrefix = preg_replace('/[^\w\/]+/', '_', $packageName);
-                $namespacePrefix = str_replace('/', '\\', $namespacePrefix) . '\\';
-                $namespacePrefix = preg_replace_callback('/(?<=^|_|\\\\)[a-z]/', function ($match) {
-                    return strtoupper($match[0]);
-                }, $namespacePrefix);
-                $this->setNamespacePrefix($namespacePrefix);
-            } elseif (isset($this->classmapPrefix)) {
-                $namespacePrefix = rtrim($this->getClassmapPrefix(), '_');
-                $this->setNamespacePrefix($namespacePrefix);
-            }
-        }
-
-        if (! isset($this->classmapPrefix)) {
-            if (isset($composer->getPackage()->getAutoload()['psr-4'])) {
-                $autoloadKey = array_key_first($composer->getPackage()->getAutoload()['psr-4']);
-                $classmapPrefix = str_replace("\\", "_", $autoloadKey);
-                $this->setClassmapPrefix($classmapPrefix);
-            } elseif (isset($composer->getPackage()->getAutoload()['psr-0'])) {
-                $autoloadKey = array_key_first($composer->getPackage()->getAutoload()['psr-0']);
-                $classmapPrefix = str_replace("\\", "_", $autoloadKey);
-                $this->setClassmapPrefix($classmapPrefix);
-            } elseif ('__root__' !== $composer->getPackage()->getName()) {
-                $packageName = $composer->getPackage()->getName();
-                $classmapPrefix = preg_replace('/[^\w\/]+/', '_', $packageName);
-                $classmapPrefix = str_replace('/', '\\', $classmapPrefix);
-                // Uppercase the first letter of each word.
-                $classmapPrefix = preg_replace_callback('/(?<=^|_|\\\\)[a-z]/', function ($match) {
-                    return strtoupper($match[0]);
-                }, $classmapPrefix);
-                $classmapPrefix = str_replace("\\", "_", $classmapPrefix);
-                $this->setClassmapPrefix($classmapPrefix);
-            } elseif (isset($this->namespacePrefix)) {
-                $classmapPrefix = preg_replace('/[^\w\/]+/', '_', $this->getNamespacePrefix());
-                $classmapPrefix = rtrim($classmapPrefix, '_') . '_';
-                $this->setClassmapPrefix($classmapPrefix);
-            }
-        }
-
-        if (!isset($this->namespacePrefix) || !isset($this->classmapPrefix)) {
-            throw new Exception('Prefix not set. Please set `namespace_prefix`, `classmap_prefix` in composer.json/extra/strauss.');
-        }
-
-        if (empty($this->packages)) {
-            $this->packages = array_map(function (\Composer\Package\Link $element) {
-                return $element->getTarget();
-            }, $composer->getPackage()->getRequires());
-        }
-
-        // If the bool flag for classmapOutput wasn't set in the Json config.
-        if (!isset($this->classmapOutput)) {
-            $this->classmapOutput = true;
-            // Check each autoloader.
-            foreach ($composer->getPackage()->getAutoload() as $autoload) {
-                // To see if one of its paths.
-                foreach ($autoload as $path) {
-                    // Matches the target directory.
-                    if (trim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR === $this->getTargetDirectory()) {
-                        $this->classmapOutput = false;
-                        break 2;
-                    }
-                }
-            }
-        }
-
-        // TODO: Throw an exception if any regex patterns in config are invalid.
-        // https://stackoverflow.com/questions/4440626/how-can-i-validate-regex
-        // preg_match('~Valid(Regular)Expression~', null) === false);
-    }
-
-    /**
-     * `target_directory` will always be returned without a leading slash and with a trailing slash.
-     *
-     * @return string
-     */
-    public function getTargetDirectory(): string
-    {
-        return trim($this->targetDirectory, DIRECTORY_SEPARATOR . '\\/') . DIRECTORY_SEPARATOR;
-    }
-
-    /**
-     * @param string $targetDirectory
-     */
-    public function setTargetDirectory(string $targetDirectory): void
-    {
-        $this->targetDirectory = trim(
-            preg_replace(
-                '/[\/\\\\]+/',
-                DIRECTORY_SEPARATOR,
-                $targetDirectory
-            ),
-            DIRECTORY_SEPARATOR
-        )
-            . DIRECTORY_SEPARATOR ;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNamespacePrefix(): string
-    {
-        return trim($this->namespacePrefix, '\\');
-    }
-
-    /**
-     * @param string $namespacePrefix
-     */
-    public function setNamespacePrefix(string $namespacePrefix): void
-    {
-        $this->namespacePrefix = $namespacePrefix;
-    }
-
-    /**
-     * @return string
-     */
-    public function getClassmapPrefix(): string
-    {
-        return $this->classmapPrefix;
-    }
-
-    /**
-     * @param string $classmapPrefix
-     */
-    public function setClassmapPrefix(string $classmapPrefix): void
-    {
-        $this->classmapPrefix = $classmapPrefix;
-    }
-
-    public function setExcludeFromCopy(array $excludeFromCopy): void
-    {
-        $this->excludeFromCopy = $excludeFromCopy;
-    }
-    public function getExcludePackagesFromCopy(): array
-    {
-        return $this->excludeFromCopy['packages'] ?? array();
-    }
-
-    public function getExcludeNamespacesFromCopy(): array
-    {
-        return $this->excludeFromCopy['namespaces'] ?? array();
-    }
-
-    public function getExcludeFilePatternsFromCopy(): array
-    {
-        return $this->excludeFromCopy['filePatterns'] ?? array();
-    }
-
-
-    public function setExcludeFromPrefix(array $excludeFromPrefix): void
-    {
-        $this->excludeFromPrefix = $excludeFromPrefix;
-    }
-
-    /**
-     * When prefixing, do not prefix these packages (which have been copied).
-     *
-     * @var string[]
-     */
-    public function getExcludePackagesFromPrefixing(): array
-    {
-        return $this->excludeFromPrefix['packages'] ?? array();
-    }
-
-    public function getExcludeNamespacesFromPrefixing(): array
-    {
-        return $this->excludeFromPrefix['namespaces'] ?? array();
-    }
-
-    public function getExcludeFilePatternsFromPrefixing(): array
-    {
-        return $this->excludeFromPrefix['filePatterns'] ?? array();
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getOverrideAutoload(): array
-    {
-        return $this->overrideAutoload;
-    }
-
-    /**
-     * @param array $overrideAutoload
-     */
-    public function setOverrideAutoload(array $overrideAutoload): void
-    {
-        $this->overrideAutoload = $overrideAutoload;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isDeleteVendorFiles(): bool
-    {
-        return $this->deleteVendorFiles;
-    }
-
-    /**
-     * @param bool $deleteVendorFiles
-     */
-    public function setDeleteVendorFiles(bool $deleteVendorFiles): void
-    {
-        $this->deleteVendorFiles = $deleteVendorFiles;
-    }
-
-    /**
-     * @return array
-     */
-    public function getPackages(): array
-    {
-        return $this->packages;
-    }
-
-    /**
-     * @param array $packages
-     */
-    public function setPackages(array $packages): void
-    {
-        $this->packages = $packages;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isClassmapOutput(): bool
-    {
-        return $this->classmapOutput;
-    }
-
-    /**
-     * @param bool $classmapOutput
-     */
-    public function setClassmapOutput(bool $classmapOutput): void
-    {
-        $this->classmapOutput = $classmapOutput;
-    }
-
-    /**
-     * Backwards compatability with Mozart.
-     */
-    public function setExcludePackages(array $excludePackages)
-    {
-
-        if (! isset($this->excludeFromPrefix)) {
-            $this->excludeFromPrefix = array();
-        }
-
-        $this->excludeFromPrefix['packages'] = $excludePackages;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getNamespaceReplacementPatterns(): array
-    {
-        return $this->namespaceReplacementPatterns;
-    }
-
-    /**
-     * @param array $namespaceReplacementPatterns
-     */
-    public function setNamespaceReplacementPatterns(array $namespaceReplacementPatterns): void
-    {
-        $this->namespaceReplacementPatterns = $namespaceReplacementPatterns;
-    }
+	/**
+	 * The output directory.
+	 *
+	 * Probably `strauss/` or `src/strauss/`.
+	 *
+	 * @var string
+	 */
+	protected $targetDirectory = 'strauss';
+
+	/**
+	 * `namespacePrefix` is the prefix to be given to any namespaces.
+	 * Presumably this will take the form `My_Project_Namespace\dep_directory`.
+	 *
+	 * @link https://www.php-fig.org/psr/psr-4/
+	 *
+	 * @var string
+	 */
+	protected $namespacePrefix;
+
+	/**
+	 * @var string
+	 */
+	protected $classmapPrefix;
+
+	/**
+	 * Packages to copy and (maybe) prefix.
+	 *
+	 * If this is empty, the "requires" list in the project composer.json is used.
+	 *
+	 * @var array
+	 */
+	protected array $packages = [];
+
+	// Back-compatibility with Mozart.
+	private array $excludePackages;
+
+	/**
+	 * @var array{packages?: string[], namespaces?: string[], filePatterns?: string[]}
+	 */
+	protected array $excludeFromCopy = array();
+
+	/**
+	 * @var array{packages?: string[], namespaces?: string[], filePatterns?: string[]}
+	 */
+	protected array $excludeFromPrefix = array('filePatterns'=>array('/^psr.*$/'));
+
+
+	/**
+	 * An array of autoload keys to replace packages' existing autoload key.
+	 *
+	 * e.g. when
+	 * * A package has no autoloader
+	 * * A package specified both a PSR-4 and a classmap but only needs one
+	 * ...
+	 *
+	 * @var array
+	 */
+	protected $overrideAutoload = [];
+
+	/**
+	 * After completing `strauss compose` should the source files be deleted?
+	 * This does not affect symlinked directories.
+	 *
+	 * @var bool
+	 */
+	protected $deleteVendorFiles = false;
+
+	protected bool $classmapOutput;
+
+	protected array $namespaceReplacementPatterns = array();
+
+
+	/**
+	 * Read any existing Mozart config.
+	 * Overwrite it with any Strauss config.
+	 * Provide sensible defaults.
+	 *
+	 * @throws Exception
+	 */
+	public function __construct(Composer $composer)
+	{
+
+		$configExtraSettings = null;
+
+		// Backwards compatibility with Mozart.
+		if (isset($composer->getPackage()->getExtra()['mozart'])) {
+			$configExtraSettings = (object)$composer->getPackage()->getExtra()['mozart'];
+
+			// Default setting for Mozart.
+			$this->setDeleteVendorFiles(true);
+		}
+
+		if (isset($composer->getPackage()->getExtra()['strauss'])) {
+			$configExtraSettings = (object)$composer->getPackage()->getExtra()['strauss'];
+		}
+
+		if (!is_null($configExtraSettings)) {
+			$mapper = (new JsonMapperFactory())->bestFit();
+
+			$rename = new Rename();
+			$rename->addMapping(StraussConfig::class, 'dep_directory', 'targetDirectory');
+			$rename->addMapping(StraussConfig::class, 'dep_namespace', 'namespacePrefix');
+
+			$rename->addMapping(StraussConfig::class, 'exclude_packages', 'excludePackages');
+			$rename->addMapping(StraussConfig::class, 'delete_vendor_directories', 'deleteVendorFiles');
+
+			$mapper->unshift($rename);
+			$mapper->push(new \JsonMapper\Middleware\CaseConversion(
+				\JsonMapper\Enums\TextNotation::UNDERSCORE(),
+				\JsonMapper\Enums\TextNotation::CAMEL_CASE()
+			));
+
+			$mapper->mapObject($configExtraSettings, $this);
+		}
+
+		// Defaults.
+		// * Use PSR-4 autoloader key
+		// * Use PSR-0 autoloader key
+		// * Use the package name
+		if (! isset($this->namespacePrefix)) {
+			if (isset($composer->getPackage()->getAutoload()['psr-4'])) {
+				$this->setNamespacePrefix(array_key_first($composer->getPackage()->getAutoload()['psr-4']));
+			} elseif (isset($composer->getPackage()->getAutoload()['psr-0'])) {
+				$this->setNamespacePrefix(array_key_first($composer->getPackage()->getAutoload()['psr-0']));
+			} elseif ('__root__' !== $composer->getPackage()->getName()) {
+				$packageName = $composer->getPackage()->getName();
+				$namespacePrefix = preg_replace('/[^\w\/]+/', '_', $packageName);
+				$namespacePrefix = str_replace('/', '\\', $namespacePrefix) . '\\';
+				$namespacePrefix = preg_replace_callback('/(?<=^|_|\\\\)[a-z]/', function ($match) {
+					return strtoupper($match[0]);
+				}, $namespacePrefix);
+				$this->setNamespacePrefix($namespacePrefix);
+			} elseif (isset($this->classmapPrefix)) {
+				$namespacePrefix = rtrim($this->getClassmapPrefix(), '_');
+				$this->setNamespacePrefix($namespacePrefix);
+			}
+		}
+
+		if (! isset($this->classmapPrefix)) {
+			if (isset($composer->getPackage()->getAutoload()['psr-4'])) {
+				$autoloadKey = array_key_first($composer->getPackage()->getAutoload()['psr-4']);
+				$classmapPrefix = str_replace("\\", "_", $autoloadKey);
+				$this->setClassmapPrefix($classmapPrefix);
+			} elseif (isset($composer->getPackage()->getAutoload()['psr-0'])) {
+				$autoloadKey = array_key_first($composer->getPackage()->getAutoload()['psr-0']);
+				$classmapPrefix = str_replace("\\", "_", $autoloadKey);
+				$this->setClassmapPrefix($classmapPrefix);
+			} elseif ('__root__' !== $composer->getPackage()->getName()) {
+				$packageName = $composer->getPackage()->getName();
+				$classmapPrefix = preg_replace('/[^\w\/]+/', '_', $packageName);
+				$classmapPrefix = str_replace('/', '\\', $classmapPrefix);
+				// Uppercase the first letter of each word.
+				$classmapPrefix = preg_replace_callback('/(?<=^|_|\\\\)[a-z]/', function ($match) {
+					return strtoupper($match[0]);
+				}, $classmapPrefix);
+				$classmapPrefix = str_replace("\\", "_", $classmapPrefix);
+				$this->setClassmapPrefix($classmapPrefix);
+			} elseif (isset($this->namespacePrefix)) {
+				$classmapPrefix = preg_replace('/[^\w\/]+/', '_', $this->getNamespacePrefix());
+				$classmapPrefix = rtrim($classmapPrefix, '_') . '_';
+				$this->setClassmapPrefix($classmapPrefix);
+			}
+		}
+
+		if (!isset($this->namespacePrefix) || !isset($this->classmapPrefix)) {
+			throw new Exception('Prefix not set. Please set `namespace_prefix`, `classmap_prefix` in composer.json/extra/strauss.');
+		}
+
+		if (empty($this->packages)) {
+			$this->packages = array_map(function (\Composer\Package\Link $element) {
+				return $element->getTarget();
+			}, $composer->getPackage()->getRequires());
+		}
+
+		// If the bool flag for classmapOutput wasn't set in the Json config.
+		if (!isset($this->classmapOutput)) {
+			$this->classmapOutput = true;
+			// Check each autoloader.
+			foreach ($composer->getPackage()->getAutoload() as $autoload) {
+				// To see if one of its paths.
+				foreach ($autoload as $path) {
+					// Matches the target directory.
+					if (trim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR === $this->getTargetDirectory()) {
+						$this->classmapOutput = false;
+						break 2;
+					}
+				}
+			}
+		}
+
+		// TODO: Throw an exception if any regex patterns in config are invalid.
+		// https://stackoverflow.com/questions/4440626/how-can-i-validate-regex
+		// preg_match('~Valid(Regular)Expression~', null) === false);
+	}
+
+	/**
+	 * `target_directory` will always be returned without a leading slash and with a trailing slash.
+	 *
+	 * @return string
+	 */
+	public function getTargetDirectory(): string
+	{
+		return trim($this->targetDirectory, DIRECTORY_SEPARATOR . '\\/') . DIRECTORY_SEPARATOR;
+	}
+
+	/**
+	 * @param string $targetDirectory
+	 */
+	public function setTargetDirectory(string $targetDirectory): void
+	{
+		$this->targetDirectory = trim(
+			preg_replace(
+				'/[\/\\\\]+/',
+				DIRECTORY_SEPARATOR,
+				$targetDirectory
+			),
+			DIRECTORY_SEPARATOR
+		)
+			. DIRECTORY_SEPARATOR ;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getNamespacePrefix(): string
+	{
+		return trim($this->namespacePrefix, '\\');
+	}
+
+	/**
+	 * @param string $namespacePrefix
+	 */
+	public function setNamespacePrefix(string $namespacePrefix): void
+	{
+		$this->namespacePrefix = $namespacePrefix;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getClassmapPrefix(): string
+	{
+		return $this->classmapPrefix;
+	}
+
+	/**
+	 * @param string $classmapPrefix
+	 */
+	public function setClassmapPrefix(string $classmapPrefix): void
+	{
+		$this->classmapPrefix = $classmapPrefix;
+	}
+
+	public function setExcludeFromCopy(array $excludeFromCopy): void
+	{
+		$this->excludeFromCopy = $excludeFromCopy;
+	}
+	public function getExcludePackagesFromCopy(): array
+	{
+		return $this->excludeFromCopy['packages'] ?? array();
+	}
+
+	public function getExcludeNamespacesFromCopy(): array
+	{
+		return $this->excludeFromCopy['namespaces'] ?? array();
+	}
+
+	public function getExcludeFilePatternsFromCopy(): array
+	{
+		return $this->excludeFromCopy['filePatterns'] ?? array();
+	}
+
+
+	public function setExcludeFromPrefix(array $excludeFromPrefix): void
+	{
+		$this->excludeFromPrefix = $excludeFromPrefix;
+	}
+
+	/**
+	 * When prefixing, do not prefix these packages (which have been copied).
+	 *
+	 * @var string[]
+	 */
+	public function getExcludePackagesFromPrefixing(): array
+	{
+		return $this->excludeFromPrefix['packages'] ?? array();
+	}
+
+	public function getExcludeNamespacesFromPrefixing(): array
+	{
+		return $this->excludeFromPrefix['namespaces'] ?? array();
+	}
+
+	public function getExcludeFilePatternsFromPrefixing(): array
+	{
+		return $this->excludeFromPrefix['filePatterns'] ?? array();
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getOverrideAutoload(): array
+	{
+		return $this->overrideAutoload;
+	}
+
+	/**
+	 * @param array $overrideAutoload
+	 */
+	public function setOverrideAutoload(array $overrideAutoload): void
+	{
+		$this->overrideAutoload = $overrideAutoload;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isDeleteVendorFiles(): bool
+	{
+		return $this->deleteVendorFiles;
+	}
+
+	/**
+	 * @param bool $deleteVendorFiles
+	 */
+	public function setDeleteVendorFiles(bool $deleteVendorFiles): void
+	{
+		$this->deleteVendorFiles = $deleteVendorFiles;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getPackages(): array
+	{
+		return $this->packages;
+	}
+
+	/**
+	 * @param array $packages
+	 */
+	public function setPackages(array $packages): void
+	{
+		$this->packages = $packages;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isClassmapOutput(): bool
+	{
+		return $this->classmapOutput;
+	}
+
+	/**
+	 * @param bool $classmapOutput
+	 */
+	public function setClassmapOutput(bool $classmapOutput): void
+	{
+		$this->classmapOutput = $classmapOutput;
+	}
+
+	/**
+	 * Backwards compatability with Mozart.
+	 */
+	public function setExcludePackages(array $excludePackages)
+	{
+
+		if (! isset($this->excludeFromPrefix)) {
+			$this->excludeFromPrefix = array();
+		}
+
+		$this->excludeFromPrefix['packages'] = $excludePackages;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getNamespaceReplacementPatterns(): array
+	{
+		return $this->namespaceReplacementPatterns;
+	}
+
+	/**
+	 * @param array $namespaceReplacementPatterns
+	 */
+	public function setNamespaceReplacementPatterns(array $namespaceReplacementPatterns): void
+	{
+		$this->namespaceReplacementPatterns = $namespaceReplacementPatterns;
+	}
 }

Spacing +86 added lines, -86 removed lines

@@ -43,7 +43,7 @@ 
      *
      * @var array
      */
-    protected array $packages = [];
+    protected array $packages = [ ];
 
     // Back-compatibility with Mozart.
     private array $excludePackages;
@@ -56,7 +56,7 @@ 
     /**
      * @var array{packages?: string[], namespaces?: string[], filePatterns?: string[]}
      */
-    protected array $excludeFromPrefix = array('filePatterns'=>array('/^psr.*$/'));
+    protected array $excludeFromPrefix = array( 'filePatterns'=>array( '/^psr.*$/' ) );
 
 
     /**
@@ -69,7 +69,7 @@ 
      *
      * @var array
      */
-    protected $overrideAutoload = [];
+    protected $overrideAutoload = [ ];
 
     /**
      * After completing `strauss compose` should the source files be deleted?
@@ -91,110 +91,110 @@ 
      *
      * @throws Exception
      */
-    public function __construct(Composer $composer)
+    public function __construct( Composer $composer )
     {
 
         $configExtraSettings = null;
 
         // Backwards compatibility with Mozart.
-        if (isset($composer->getPackage()->getExtra()['mozart'])) {
-            $configExtraSettings = (object)$composer->getPackage()->getExtra()['mozart'];
+        if ( isset( $composer->getPackage()->getExtra()[ 'mozart' ] ) ) {
+            $configExtraSettings = (object)$composer->getPackage()->getExtra()[ 'mozart' ];
 
             // Default setting for Mozart.
-            $this->setDeleteVendorFiles(true);
+            $this->setDeleteVendorFiles( true );
         }
 
-        if (isset($composer->getPackage()->getExtra()['strauss'])) {
-            $configExtraSettings = (object)$composer->getPackage()->getExtra()['strauss'];
+        if ( isset( $composer->getPackage()->getExtra()[ 'strauss' ] ) ) {
+            $configExtraSettings = (object)$composer->getPackage()->getExtra()[ 'strauss' ];
         }
 
-        if (!is_null($configExtraSettings)) {
-            $mapper = (new JsonMapperFactory())->bestFit();
+        if ( ! is_null( $configExtraSettings ) ) {
+            $mapper = ( new JsonMapperFactory() )->bestFit();
 
             $rename = new Rename();
-            $rename->addMapping(StraussConfig::class, 'dep_directory', 'targetDirectory');
-            $rename->addMapping(StraussConfig::class, 'dep_namespace', 'namespacePrefix');
+            $rename->addMapping( StraussConfig::class, 'dep_directory', 'targetDirectory' );
+            $rename->addMapping( StraussConfig::class, 'dep_namespace', 'namespacePrefix' );
 
-            $rename->addMapping(StraussConfig::class, 'exclude_packages', 'excludePackages');
-            $rename->addMapping(StraussConfig::class, 'delete_vendor_directories', 'deleteVendorFiles');
+            $rename->addMapping( StraussConfig::class, 'exclude_packages', 'excludePackages' );
+            $rename->addMapping( StraussConfig::class, 'delete_vendor_directories', 'deleteVendorFiles' );
 
-            $mapper->unshift($rename);
-            $mapper->push(new \JsonMapper\Middleware\CaseConversion(
+            $mapper->unshift( $rename );
+            $mapper->push( new \JsonMapper\Middleware\CaseConversion(
                 \JsonMapper\Enums\TextNotation::UNDERSCORE(),
                 \JsonMapper\Enums\TextNotation::CAMEL_CASE()
-            ));
+            ) );
 
-            $mapper->mapObject($configExtraSettings, $this);
+            $mapper->mapObject( $configExtraSettings, $this );
         }
 
         // Defaults.
         // * Use PSR-4 autoloader key
         // * Use PSR-0 autoloader key
         // * Use the package name
-        if (! isset($this->namespacePrefix)) {
-            if (isset($composer->getPackage()->getAutoload()['psr-4'])) {
-                $this->setNamespacePrefix(array_key_first($composer->getPackage()->getAutoload()['psr-4']));
-            } elseif (isset($composer->getPackage()->getAutoload()['psr-0'])) {
-                $this->setNamespacePrefix(array_key_first($composer->getPackage()->getAutoload()['psr-0']));
-            } elseif ('__root__' !== $composer->getPackage()->getName()) {
+        if ( ! isset( $this->namespacePrefix ) ) {
+            if ( isset( $composer->getPackage()->getAutoload()[ 'psr-4' ] ) ) {
+                $this->setNamespacePrefix( array_key_first( $composer->getPackage()->getAutoload()[ 'psr-4' ] ) );
+            } elseif ( isset( $composer->getPackage()->getAutoload()[ 'psr-0' ] ) ) {
+                $this->setNamespacePrefix( array_key_first( $composer->getPackage()->getAutoload()[ 'psr-0' ] ) );
+            } elseif ( '__root__' !== $composer->getPackage()->getName() ) {
                 $packageName = $composer->getPackage()->getName();
-                $namespacePrefix = preg_replace('/[^\w\/]+/', '_', $packageName);
-                $namespacePrefix = str_replace('/', '\\', $namespacePrefix) . '\\';
-                $namespacePrefix = preg_replace_callback('/(?<=^|_|\\\\)[a-z]/', function ($match) {
-                    return strtoupper($match[0]);
-                }, $namespacePrefix);
-                $this->setNamespacePrefix($namespacePrefix);
-            } elseif (isset($this->classmapPrefix)) {
-                $namespacePrefix = rtrim($this->getClassmapPrefix(), '_');
-                $this->setNamespacePrefix($namespacePrefix);
+                $namespacePrefix = preg_replace( '/[^\w\/]+/', '_', $packageName );
+                $namespacePrefix = str_replace( '/', '\\', $namespacePrefix ) . '\\';
+                $namespacePrefix = preg_replace_callback( '/(?<=^|_|\\\\)[a-z]/', function( $match ) {
+                    return strtoupper( $match[ 0 ] );
+                }, $namespacePrefix );
+                $this->setNamespacePrefix( $namespacePrefix );
+            } elseif ( isset( $this->classmapPrefix ) ) {
+                $namespacePrefix = rtrim( $this->getClassmapPrefix(), '_' );
+                $this->setNamespacePrefix( $namespacePrefix );
             }
         }
 
-        if (! isset($this->classmapPrefix)) {
-            if (isset($composer->getPackage()->getAutoload()['psr-4'])) {
-                $autoloadKey = array_key_first($composer->getPackage()->getAutoload()['psr-4']);
-                $classmapPrefix = str_replace("\\", "_", $autoloadKey);
-                $this->setClassmapPrefix($classmapPrefix);
-            } elseif (isset($composer->getPackage()->getAutoload()['psr-0'])) {
-                $autoloadKey = array_key_first($composer->getPackage()->getAutoload()['psr-0']);
-                $classmapPrefix = str_replace("\\", "_", $autoloadKey);
-                $this->setClassmapPrefix($classmapPrefix);
-            } elseif ('__root__' !== $composer->getPackage()->getName()) {
+        if ( ! isset( $this->classmapPrefix ) ) {
+            if ( isset( $composer->getPackage()->getAutoload()[ 'psr-4' ] ) ) {
+                $autoloadKey = array_key_first( $composer->getPackage()->getAutoload()[ 'psr-4' ] );
+                $classmapPrefix = str_replace( "\\", "_", $autoloadKey );
+                $this->setClassmapPrefix( $classmapPrefix );
+            } elseif ( isset( $composer->getPackage()->getAutoload()[ 'psr-0' ] ) ) {
+                $autoloadKey = array_key_first( $composer->getPackage()->getAutoload()[ 'psr-0' ] );
+                $classmapPrefix = str_replace( "\\", "_", $autoloadKey );
+                $this->setClassmapPrefix( $classmapPrefix );
+            } elseif ( '__root__' !== $composer->getPackage()->getName() ) {
                 $packageName = $composer->getPackage()->getName();
-                $classmapPrefix = preg_replace('/[^\w\/]+/', '_', $packageName);
-                $classmapPrefix = str_replace('/', '\\', $classmapPrefix);
+                $classmapPrefix = preg_replace( '/[^\w\/]+/', '_', $packageName );
+                $classmapPrefix = str_replace( '/', '\\', $classmapPrefix );
                 // Uppercase the first letter of each word.
-                $classmapPrefix = preg_replace_callback('/(?<=^|_|\\\\)[a-z]/', function ($match) {
-                    return strtoupper($match[0]);
-                }, $classmapPrefix);
-                $classmapPrefix = str_replace("\\", "_", $classmapPrefix);
-                $this->setClassmapPrefix($classmapPrefix);
-            } elseif (isset($this->namespacePrefix)) {
-                $classmapPrefix = preg_replace('/[^\w\/]+/', '_', $this->getNamespacePrefix());
-                $classmapPrefix = rtrim($classmapPrefix, '_') . '_';
-                $this->setClassmapPrefix($classmapPrefix);
+                $classmapPrefix = preg_replace_callback( '/(?<=^|_|\\\\)[a-z]/', function( $match ) {
+                    return strtoupper( $match[ 0 ] );
+                }, $classmapPrefix );
+                $classmapPrefix = str_replace( "\\", "_", $classmapPrefix );
+                $this->setClassmapPrefix( $classmapPrefix );
+            } elseif ( isset( $this->namespacePrefix ) ) {
+                $classmapPrefix = preg_replace( '/[^\w\/]+/', '_', $this->getNamespacePrefix() );
+                $classmapPrefix = rtrim( $classmapPrefix, '_' ) . '_';
+                $this->setClassmapPrefix( $classmapPrefix );
             }
         }
 
-        if (!isset($this->namespacePrefix) || !isset($this->classmapPrefix)) {
-            throw new Exception('Prefix not set. Please set `namespace_prefix`, `classmap_prefix` in composer.json/extra/strauss.');
+        if ( ! isset( $this->namespacePrefix ) || ! isset( $this->classmapPrefix ) ) {
+            throw new Exception( 'Prefix not set. Please set `namespace_prefix`, `classmap_prefix` in composer.json/extra/strauss.' );
         }
 
-        if (empty($this->packages)) {
-            $this->packages = array_map(function (\Composer\Package\Link $element) {
+        if ( empty( $this->packages ) ) {
+            $this->packages = array_map( function( \Composer\Package\Link $element ) {
                 return $element->getTarget();
-            }, $composer->getPackage()->getRequires());
+            }, $composer->getPackage()->getRequires() );
         }
 
         // If the bool flag for classmapOutput wasn't set in the Json config.
-        if (!isset($this->classmapOutput)) {
+        if ( ! isset( $this->classmapOutput ) ) {
             $this->classmapOutput = true;
             // Check each autoloader.
-            foreach ($composer->getPackage()->getAutoload() as $autoload) {
+            foreach ( $composer->getPackage()->getAutoload() as $autoload ) {
                 // To see if one of its paths.
-                foreach ($autoload as $path) {
+                foreach ( $autoload as $path ) {
                     // Matches the target directory.
-                    if (trim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR === $this->getTargetDirectory()) {
+                    if ( trim( $path, DIRECTORY_SEPARATOR ) . DIRECTORY_SEPARATOR === $this->getTargetDirectory() ) {
                         $this->classmapOutput = false;
                         break 2;
                     }
@@ -214,13 +214,13 @@ 
      */
     public function getTargetDirectory(): string
     {
-        return trim($this->targetDirectory, DIRECTORY_SEPARATOR . '\\/') . DIRECTORY_SEPARATOR;
+        return trim( $this->targetDirectory, DIRECTORY_SEPARATOR . '\\/' ) . DIRECTORY_SEPARATOR;
     }
 
     /**
      * @param string $targetDirectory
      */
-    public function setTargetDirectory(string $targetDirectory): void
+    public function setTargetDirectory( string $targetDirectory ): void
     {
         $this->targetDirectory = trim(
             preg_replace(
@@ -230,7 +230,7 @@ 
             ),
             DIRECTORY_SEPARATOR
         )
-            . DIRECTORY_SEPARATOR ;
+            . DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -238,13 +238,13 @@ 
      */
     public function getNamespacePrefix(): string
     {
-        return trim($this->namespacePrefix, '\\');
+        return trim( $this->namespacePrefix, '\\' );
     }
 
     /**
      * @param string $namespacePrefix
      */
-    public function setNamespacePrefix(string $namespacePrefix): void
+    public function setNamespacePrefix( string $namespacePrefix ): void
     {
         $this->namespacePrefix = $namespacePrefix;
     }
@@ -260,32 +260,32 @@ 
     /**
      * @param string $classmapPrefix
      */
-    public function setClassmapPrefix(string $classmapPrefix): void
+    public function setClassmapPrefix( string $classmapPrefix ): void
     {
         $this->classmapPrefix = $classmapPrefix;
     }
 
-    public function setExcludeFromCopy(array $excludeFromCopy): void
+    public function setExcludeFromCopy( array $excludeFromCopy ): void
     {
         $this->excludeFromCopy = $excludeFromCopy;
     }
     public function getExcludePackagesFromCopy(): array
     {
-        return $this->excludeFromCopy['packages'] ?? array();
+        return $this->excludeFromCopy[ 'packages' ] ?? array();
     }
 
     public function getExcludeNamespacesFromCopy(): array
     {
-        return $this->excludeFromCopy['namespaces'] ?? array();
+        return $this->excludeFromCopy[ 'namespaces' ] ?? array();
     }
 
     public function getExcludeFilePatternsFromCopy(): array
     {
-        return $this->excludeFromCopy['filePatterns'] ?? array();
+        return $this->excludeFromCopy[ 'filePatterns' ] ?? array();
     }
 
 
-    public function setExcludeFromPrefix(array $excludeFromPrefix): void
+    public function setExcludeFromPrefix( array $excludeFromPrefix ): void
     {
         $this->excludeFromPrefix = $excludeFromPrefix;
     }
@@ -297,17 +297,17 @@ 
      */
     public function getExcludePackagesFromPrefixing(): array
     {
-        return $this->excludeFromPrefix['packages'] ?? array();
+        return $this->excludeFromPrefix[ 'packages' ] ?? array();
     }
 
     public function getExcludeNamespacesFromPrefixing(): array
     {
-        return $this->excludeFromPrefix['namespaces'] ?? array();
+        return $this->excludeFromPrefix[ 'namespaces' ] ?? array();
     }
 
     public function getExcludeFilePatternsFromPrefixing(): array
     {
-        return $this->excludeFromPrefix['filePatterns'] ?? array();
+        return $this->excludeFromPrefix[ 'filePatterns' ] ?? array();
     }
 
 
@@ -322,7 +322,7 @@ 
     /**
      * @param array $overrideAutoload
      */
-    public function setOverrideAutoload(array $overrideAutoload): void
+    public function setOverrideAutoload( array $overrideAutoload ): void
     {
         $this->overrideAutoload = $overrideAutoload;
     }
@@ -338,7 +338,7 @@ 
     /**
      * @param bool $deleteVendorFiles
      */
-    public function setDeleteVendorFiles(bool $deleteVendorFiles): void
+    public function setDeleteVendorFiles( bool $deleteVendorFiles ): void
     {
         $this->deleteVendorFiles = $deleteVendorFiles;
     }
@@ -354,7 +354,7 @@ 
     /**
      * @param array $packages
      */
-    public function setPackages(array $packages): void
+    public function setPackages( array $packages ): void
     {
         $this->packages = $packages;
     }
@@ -370,7 +370,7 @@ 
     /**
      * @param bool $classmapOutput
      */
-    public function setClassmapOutput(bool $classmapOutput): void
+    public function setClassmapOutput( bool $classmapOutput ): void
     {
         $this->classmapOutput = $classmapOutput;
     }
@@ -378,14 +378,14 @@ 
     /**
      * Backwards compatability with Mozart.
      */
-    public function setExcludePackages(array $excludePackages)
+    public function setExcludePackages( array $excludePackages )
     {
 
-        if (! isset($this->excludeFromPrefix)) {
+        if ( ! isset( $this->excludeFromPrefix ) ) {
             $this->excludeFromPrefix = array();
         }
 
-        $this->excludeFromPrefix['packages'] = $excludePackages;
+        $this->excludeFromPrefix[ 'packages' ] = $excludePackages;
     }
 
 
@@ -400,7 +400,7 @@ 
     /**
      * @param array $namespaceReplacementPatterns
      */
-    public function setNamespaceReplacementPatterns(array $namespaceReplacementPatterns): void
+    public function setNamespaceReplacementPatterns( array $namespaceReplacementPatterns ): void
     {
         $this->namespaceReplacementPatterns = $namespaceReplacementPatterns;
     }

Braces +3 added lines, -6 removed lines

@@ -10,8 +10,7 @@ 
 use JsonMapper\JsonMapperFactory;
 use JsonMapper\Middleware\Rename\Rename;
 
-class StraussConfig
-{
+class StraussConfig {
     /**
      * The output directory.
      *
@@ -91,8 +90,7 @@ 
      *
      * @throws Exception
      */
-    public function __construct(Composer $composer)
-    {
+    public function __construct(Composer $composer) {
 
         $configExtraSettings = null;
 
@@ -378,8 +376,7 @@ 
     /**
      * Backwards compatability with Mozart.
      */
-    public function setExcludePackages(array $excludePackages)
-    {
+    public function setExcludePackages(array $excludePackages) {
 
         if (! isset($this->excludeFromPrefix)) {
             $this->excludeFromPrefix = array();

vendor/brianhenryie/strauss/src/Composer/ComposerPackage.php

Indentation +130 added lines, -130 removed lines

@@ -13,134 +13,134 @@
 
 class ComposerPackage
 {
-    /**
-     * The composer.json file as parsed by Composer.
-     *
-     * @see \Composer\Factory::create
-     *
-     * @var \Composer\Composer
-     */
-    protected \Composer\Composer $composer;
-
-    /**
-     * The name of the project in composer.json.
-     *
-     * e.g. brianhenryie/my-project
-     *
-     * @var string
-     */
-    protected string $name;
-
-    protected string $path;
-
-    /**
-     * The discovered files, classmap, psr0 and psr4 autoload keys discovered (as parsed by Composer).
-     *
-     * @var array<string, array<string, string>>
-     */
-    protected array $autoload = [];
-
-    /**
-     * The names in the composer.json's "requires" field (without versions).
-     *
-     * @var array
-     */
-    protected array $requiresNames = [];
-
-    protected string $license;
-
-    /**
-     * Create a PHP object to represent a composer package.
-     *
-     * @param string $absolutePath The absolute path to the vendor folder with the composer.json "name",
-     *          i.e. the domain/package definition, which is the vendor subdir from where the package's
-     *          composer.json should be read.
-     * @param array $overrideAutoload Optional configuration to replace the package's own autoload definition with
-     *                                    another which Strauss can use.
-     */
-    public function __construct(string $absolutePath, array $overrideAutoload = null)
-    {
-
-        if (is_dir($absolutePath)) {
-            $absolutePath = rtrim($absolutePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'composer.json';
-        }
-
-        $composer = Factory::create(new NullIO(), $absolutePath);
-
-        $this->composer = $composer;
-
-        $this->name = $composer->getPackage()->getName();
-
-        $relativePath = null;
-
-        // TODO: Test on Windows (DIRECTORY_SEPARATOR).
-        if (1 === preg_match('/vendor\/(\w*\/\w*)\/composer\.json/', $absolutePath, $output_array)) {
-            $relativePath = $output_array[1];
-        }
-
-        $this->path = $relativePath ?? $composer->getPackage()->getName();
-
-        if (!is_null($overrideAutoload)) {
-            $composer->getPackage()->setAutoload($overrideAutoload);
-        }
-
-        $this->autoload = $composer->getPackage()->getAutoload();
-
-        foreach ($composer->getPackage()->getRequires() as $_name => $packageLink) {
-            $this->requiresNames[] = $packageLink->getTarget();
-        }
-
-        // Try to get the license from the package's composer.json, asssume proprietary (all rights reserved!).
-        $this->license = !empty($composer->getPackage()->getLicense())
-            ? implode(',', $composer->getPackage()->getLicense())
-            : 'proprietary?';
-    }
-
-    /**
-     * Composer package project name.
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function getPath(): string
-    {
-        return $this->path;
-    }
-
-    /**
-     *
-     * e.g. ['psr-4' => [ 'BrianHenryIE\Project' => 'src' ]]
-     *
-     * @return array<string, array<int|string, string>>
-     */
-    public function getAutoload(): array
-    {
-        return $this->autoload;
-    }
-
-    /**
-     * The names of the packages in the composer.json's "requires" field (without version).
-     *
-     * Excludes PHP, ext-*, since we won't be copying or prefixing them.
-     *
-     * @return string[]
-     */
-    public function getRequiresNames(): array
-    {
-        // Unset PHP, ext-*.
-        $removePhpExt = function ($element) {
-            return !( 0 === strpos($element, 'ext') || 'php' === $element );
-        };
-
-        return array_filter($this->requiresNames, $removePhpExt);
-    }
-
-    public function getLicense():string
-    {
-        return $this->license;
-    }
+	/**
+	 * The composer.json file as parsed by Composer.
+	 *
+	 * @see \Composer\Factory::create
+	 *
+	 * @var \Composer\Composer
+	 */
+	protected \Composer\Composer $composer;
+
+	/**
+	 * The name of the project in composer.json.
+	 *
+	 * e.g. brianhenryie/my-project
+	 *
+	 * @var string
+	 */
+	protected string $name;
+
+	protected string $path;
+
+	/**
+	 * The discovered files, classmap, psr0 and psr4 autoload keys discovered (as parsed by Composer).
+	 *
+	 * @var array<string, array<string, string>>
+	 */
+	protected array $autoload = [];
+
+	/**
+	 * The names in the composer.json's "requires" field (without versions).
+	 *
+	 * @var array
+	 */
+	protected array $requiresNames = [];
+
+	protected string $license;
+
+	/**
+	 * Create a PHP object to represent a composer package.
+	 *
+	 * @param string $absolutePath The absolute path to the vendor folder with the composer.json "name",
+	 *          i.e. the domain/package definition, which is the vendor subdir from where the package's
+	 *          composer.json should be read.
+	 * @param array $overrideAutoload Optional configuration to replace the package's own autoload definition with
+	 *                                    another which Strauss can use.
+	 */
+	public function __construct(string $absolutePath, array $overrideAutoload = null)
+	{
+
+		if (is_dir($absolutePath)) {
+			$absolutePath = rtrim($absolutePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'composer.json';
+		}
+
+		$composer = Factory::create(new NullIO(), $absolutePath);
+
+		$this->composer = $composer;
+
+		$this->name = $composer->getPackage()->getName();
+
+		$relativePath = null;
+
+		// TODO: Test on Windows (DIRECTORY_SEPARATOR).
+		if (1 === preg_match('/vendor\/(\w*\/\w*)\/composer\.json/', $absolutePath, $output_array)) {
+			$relativePath = $output_array[1];
+		}
+
+		$this->path = $relativePath ?? $composer->getPackage()->getName();
+
+		if (!is_null($overrideAutoload)) {
+			$composer->getPackage()->setAutoload($overrideAutoload);
+		}
+
+		$this->autoload = $composer->getPackage()->getAutoload();
+
+		foreach ($composer->getPackage()->getRequires() as $_name => $packageLink) {
+			$this->requiresNames[] = $packageLink->getTarget();
+		}
+
+		// Try to get the license from the package's composer.json, asssume proprietary (all rights reserved!).
+		$this->license = !empty($composer->getPackage()->getLicense())
+			? implode(',', $composer->getPackage()->getLicense())
+			: 'proprietary?';
+	}
+
+	/**
+	 * Composer package project name.
+	 *
+	 * @return string
+	 */
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+	public function getPath(): string
+	{
+		return $this->path;
+	}
+
+	/**
+	 *
+	 * e.g. ['psr-4' => [ 'BrianHenryIE\Project' => 'src' ]]
+	 *
+	 * @return array<string, array<int|string, string>>
+	 */
+	public function getAutoload(): array
+	{
+		return $this->autoload;
+	}
+
+	/**
+	 * The names of the packages in the composer.json's "requires" field (without version).
+	 *
+	 * Excludes PHP, ext-*, since we won't be copying or prefixing them.
+	 *
+	 * @return string[]
+	 */
+	public function getRequiresNames(): array
+	{
+		// Unset PHP, ext-*.
+		$removePhpExt = function ($element) {
+			return !( 0 === strpos($element, 'ext') || 'php' === $element );
+		};
+
+		return array_filter($this->requiresNames, $removePhpExt);
+	}
+
+	public function getLicense():string
+	{
+		return $this->license;
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -38,14 +38,14 @@ 
      *
      * @var array<string, array<string, string>>
      */
-    protected array $autoload = [];
+    protected array $autoload = [ ];
 
     /**
      * The names in the composer.json's "requires" field (without versions).
      *
      * @var array
      */
-    protected array $requiresNames = [];
+    protected array $requiresNames = [ ];
 
     protected string $license;
 
@@ -58,14 +58,14 @@ 
      * @param array $overrideAutoload Optional configuration to replace the package's own autoload definition with
      *                                    another which Strauss can use.
      */
-    public function __construct(string $absolutePath, array $overrideAutoload = null)
+    public function __construct( string $absolutePath, array $overrideAutoload = null )
     {
 
-        if (is_dir($absolutePath)) {
-            $absolutePath = rtrim($absolutePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'composer.json';
+        if ( is_dir( $absolutePath ) ) {
+            $absolutePath = rtrim( $absolutePath, DIRECTORY_SEPARATOR ) . DIRECTORY_SEPARATOR . 'composer.json';
         }
 
-        $composer = Factory::create(new NullIO(), $absolutePath);
+        $composer = Factory::create( new NullIO(), $absolutePath );
 
         $this->composer = $composer;
 
@@ -74,25 +74,25 @@ 
         $relativePath = null;
 
         // TODO: Test on Windows (DIRECTORY_SEPARATOR).
-        if (1 === preg_match('/vendor\/(\w*\/\w*)\/composer\.json/', $absolutePath, $output_array)) {
-            $relativePath = $output_array[1];
+        if ( 1 === preg_match( '/vendor\/(\w*\/\w*)\/composer\.json/', $absolutePath, $output_array ) ) {
+            $relativePath = $output_array[ 1 ];
         }
 
         $this->path = $relativePath ?? $composer->getPackage()->getName();
 
-        if (!is_null($overrideAutoload)) {
-            $composer->getPackage()->setAutoload($overrideAutoload);
+        if ( ! is_null( $overrideAutoload ) ) {
+            $composer->getPackage()->setAutoload( $overrideAutoload );
         }
 
         $this->autoload = $composer->getPackage()->getAutoload();
 
-        foreach ($composer->getPackage()->getRequires() as $_name => $packageLink) {
-            $this->requiresNames[] = $packageLink->getTarget();
+        foreach ( $composer->getPackage()->getRequires() as $_name => $packageLink ) {
+            $this->requiresNames[ ] = $packageLink->getTarget();
         }
 
         // Try to get the license from the package's composer.json, asssume proprietary (all rights reserved!).
-        $this->license = !empty($composer->getPackage()->getLicense())
-            ? implode(',', $composer->getPackage()->getLicense())
+        $this->license = ! empty( $composer->getPackage()->getLicense() )
+            ? implode( ',', $composer->getPackage()->getLicense() )
             : 'proprietary?';
     }
 
@@ -132,11 +132,11 @@ 
     public function getRequiresNames(): array
     {
         // Unset PHP, ext-*.
-        $removePhpExt = function ($element) {
-            return !( 0 === strpos($element, 'ext') || 'php' === $element );
+        $removePhpExt = function( $element ) {
+            return ! ( 0 === strpos( $element, 'ext' ) || 'php' === $element );
         };
 
-        return array_filter($this->requiresNames, $removePhpExt);
+        return array_filter( $this->requiresNames, $removePhpExt );
     }
 
     public function getLicense():string

Braces +2 added lines, -4 removed lines

@@ -11,8 +11,7 @@ 
 use Composer\IO\NullIO;
 use stdClass;
 
-class ComposerPackage
-{
+class ComposerPackage {
     /**
      * The composer.json file as parsed by Composer.
      *
@@ -58,8 +57,7 @@ 
      * @param array $overrideAutoload Optional configuration to replace the package's own autoload definition with
      *                                    another which Strauss can use.
      */
-    public function __construct(string $absolutePath, array $overrideAutoload = null)
-    {
+    public function __construct(string $absolutePath, array $overrideAutoload = null) {
 
         if (is_dir($absolutePath)) {
             $absolutePath = rtrim($absolutePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'composer.json';

vendor/brianhenryie/strauss/src/Composer/ProjectComposerPackage.php

Indentation +44 added lines, -44 removed lines

@@ -9,48 +9,48 @@
 
 class ProjectComposerPackage extends ComposerPackage
 {
-    protected string $author;
-
-    protected string $vendorDirectory;
-
-    public function __construct(string $absolutePath, array $overrideAutoload = null)
-    {
-        parent::__construct($absolutePath, $overrideAutoload);
-
-        $authors = $this->composer->getPackage()->getAuthors();
-        if (empty($authors) || !isset($authors[0]['name'])) {
-            $this->author = explode("/", $this->name, 2)[0];
-        } else {
-            $this->author = $authors[0]['name'];
-        }
-
-        $vendorDirectory = $this->composer->getConfig()->get('vendor-dir');
-        if (is_string($vendorDirectory)) {
-            $vendorDirectory = str_replace($absolutePath, '', (string) $vendorDirectory);
-            $this->vendorDirectory = $vendorDirectory;
-        } else {
-            $this->vendorDirectory = 'vendor' . DIRECTORY_SEPARATOR;
-        }
-    }
-
-    /**
-     * @return StraussConfig
-     * @throws \Exception
-     */
-    public function getStraussConfig(): StraussConfig
-    {
-
-        return new StraussConfig($this->composer);
-    }
-
-
-    public function getAuthor(): string
-    {
-        return $this->author;
-    }
-
-    public function getVendorDirectory(): string
-    {
-        return rtrim($this->vendorDirectory, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-    }
+	protected string $author;
+
+	protected string $vendorDirectory;
+
+	public function __construct(string $absolutePath, array $overrideAutoload = null)
+	{
+		parent::__construct($absolutePath, $overrideAutoload);
+
+		$authors = $this->composer->getPackage()->getAuthors();
+		if (empty($authors) || !isset($authors[0]['name'])) {
+			$this->author = explode("/", $this->name, 2)[0];
+		} else {
+			$this->author = $authors[0]['name'];
+		}
+
+		$vendorDirectory = $this->composer->getConfig()->get('vendor-dir');
+		if (is_string($vendorDirectory)) {
+			$vendorDirectory = str_replace($absolutePath, '', (string) $vendorDirectory);
+			$this->vendorDirectory = $vendorDirectory;
+		} else {
+			$this->vendorDirectory = 'vendor' . DIRECTORY_SEPARATOR;
+		}
+	}
+
+	/**
+	 * @return StraussConfig
+	 * @throws \Exception
+	 */
+	public function getStraussConfig(): StraussConfig
+	{
+
+		return new StraussConfig($this->composer);
+	}
+
+
+	public function getAuthor(): string
+	{
+		return $this->author;
+	}
+
+	public function getVendorDirectory(): string
+	{
+		return rtrim($this->vendorDirectory, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -13,20 +13,20 @@ 
 
     protected string $vendorDirectory;
 
-    public function __construct(string $absolutePath, array $overrideAutoload = null)
+    public function __construct( string $absolutePath, array $overrideAutoload = null )
     {
-        parent::__construct($absolutePath, $overrideAutoload);
+        parent::__construct( $absolutePath, $overrideAutoload );
 
         $authors = $this->composer->getPackage()->getAuthors();
-        if (empty($authors) || !isset($authors[0]['name'])) {
-            $this->author = explode("/", $this->name, 2)[0];
+        if ( empty( $authors ) || ! isset( $authors[ 0 ][ 'name' ] ) ) {
+            $this->author = explode( "/", $this->name, 2 )[ 0 ];
         } else {
-            $this->author = $authors[0]['name'];
+            $this->author = $authors[ 0 ][ 'name' ];
         }
 
-        $vendorDirectory = $this->composer->getConfig()->get('vendor-dir');
-        if (is_string($vendorDirectory)) {
-            $vendorDirectory = str_replace($absolutePath, '', (string) $vendorDirectory);
+        $vendorDirectory = $this->composer->getConfig()->get( 'vendor-dir' );
+        if ( is_string( $vendorDirectory ) ) {
+            $vendorDirectory = str_replace( $absolutePath, '', (string)$vendorDirectory );
             $this->vendorDirectory = $vendorDirectory;
         } else {
             $this->vendorDirectory = 'vendor' . DIRECTORY_SEPARATOR;
@@ -40,7 +40,7 @@ 
     public function getStraussConfig(): StraussConfig
     {
 
-        return new StraussConfig($this->composer);
+        return new StraussConfig( $this->composer );
     }
 
 
@@ -51,6 +51,6 @@ 
 
     public function getVendorDirectory(): string
     {
-        return rtrim($this->vendorDirectory, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        return rtrim( $this->vendorDirectory, DIRECTORY_SEPARATOR ) . DIRECTORY_SEPARATOR;
     }
 }

Braces +2 added lines, -4 removed lines

@@ -7,14 +7,12 @@
 
 use BrianHenryIE\Strauss\Composer\Extra\StraussConfig;
 
-class ProjectComposerPackage extends ComposerPackage
-{
+class ProjectComposerPackage extends ComposerPackage {
     protected string $author;
 
     protected string $vendorDirectory;
 
-    public function __construct(string $absolutePath, array $overrideAutoload = null)
-    {
+    public function __construct(string $absolutePath, array $overrideAutoload = null) {
         parent::__construct($absolutePath, $overrideAutoload);
 
         $authors = $this->composer->getPackage()->getAuthors();

vendor/brianhenryie/strauss/src/Autoload.php

Indentation +142 added lines, -142 removed lines

@@ -15,152 +15,152 @@ 
 class Autoload
 {
 
-    /** @var Filesystem */
-    protected $filesystem;
-
-    protected string $workingDir;
-
-    protected StraussConfig $config;
-
-    /**
-     * The files autolaoders of packages that have been copied by Strauss.
-     * Keyed by package path.
-     *
-     * @var array
-     */
-    protected array $discoveredFilesAutoloaders;
-
-    /**
-     * Autoload constructor.
-     * @param StraussConfig $config
-     * @param string $workingDir
-     * @param array<string, array<string>> $files
-     */
-    public function __construct(StraussConfig $config, string $workingDir, array $discoveredFilesAutoloaders)
-    {
-        $this->config = $config;
-        $this->workingDir = $workingDir;
-        $this->discoveredFilesAutoloaders = $discoveredFilesAutoloaders;
-        $this->filesystem = new Filesystem(new Local($workingDir));
-    }
-
-    public function generate()
-    {
-
-        if (! $this->config->isClassmapOutput()) {
-            return;
-        }
-
-        // TODO Don't do this if vendor is the target dir (i.e. in-situ updating).
-
-        $this->generateClassmap();
-
-        $this->generateFilesAutoloader();
-
-        $this->generateAutoloadPhp();
-    }
+	/** @var Filesystem */
+	protected $filesystem;
+
+	protected string $workingDir;
+
+	protected StraussConfig $config;
+
+	/**
+	 * The files autolaoders of packages that have been copied by Strauss.
+	 * Keyed by package path.
+	 *
+	 * @var array
+	 */
+	protected array $discoveredFilesAutoloaders;
+
+	/**
+	 * Autoload constructor.
+	 * @param StraussConfig $config
+	 * @param string $workingDir
+	 * @param array<string, array<string>> $files
+	 */
+	public function __construct(StraussConfig $config, string $workingDir, array $discoveredFilesAutoloaders)
+	{
+		$this->config = $config;
+		$this->workingDir = $workingDir;
+		$this->discoveredFilesAutoloaders = $discoveredFilesAutoloaders;
+		$this->filesystem = new Filesystem(new Local($workingDir));
+	}
 
-    /**
-     * Uses Composer's `ClassMapGenerator::createMap()` to scan the directories for classes and generate the map.
-     *
-     * createMap() returns the full local path, so we then replace the root of the path with a variable.
-     *
-     * @see ClassMapGenerator::dump()
-     *
-     */
-    protected function generateClassmap(): string
-    {
-
-        // Hyphen used to match WordPress Coding Standards.
-        $output_filename = "autoload-classmap.php";
-
-        $targetDirectory = getcwd()
-            . DIRECTORY_SEPARATOR
-            . ltrim($this->config->getTargetDirectory(), DIRECTORY_SEPARATOR);
-
-        $dirs = array(
-            $targetDirectory
-        );
-
-        $dirname = '';
-
-        foreach ($dirs as $dir) {
-            if (!is_dir($dir)) {
-                continue;
-            }
+	public function generate()
+	{
+
+		if (! $this->config->isClassmapOutput()) {
+			return;
+		}
+
+		// TODO Don't do this if vendor is the target dir (i.e. in-situ updating).
+
+		$this->generateClassmap();
+
+		$this->generateFilesAutoloader();
+
+		$this->generateAutoloadPhp();
+	}
+
+	/**
+	 * Uses Composer's `ClassMapGenerator::createMap()` to scan the directories for classes and generate the map.
+	 *
+	 * createMap() returns the full local path, so we then replace the root of the path with a variable.
+	 *
+	 * @see ClassMapGenerator::dump()
+	 *
+	 */
+	protected function generateClassmap(): string
+	{
+
+		// Hyphen used to match WordPress Coding Standards.
+		$output_filename = "autoload-classmap.php";
+
+		$targetDirectory = getcwd()
+			. DIRECTORY_SEPARATOR
+			. ltrim($this->config->getTargetDirectory(), DIRECTORY_SEPARATOR);
+
+		$dirs = array(
+			$targetDirectory
+		);
+
+		$dirname = '';
+
+		foreach ($dirs as $dir) {
+			if (!is_dir($dir)) {
+				continue;
+			}
+
+			$dirMap = ClassMapGenerator::createMap($dir);
+
+			$dirname = preg_replace('/[^a-z]/i', '', str_replace(getcwd(), '', $dir));
+
+			array_walk(
+				$dirMap,
+				function (&$filepath, $_class) use ($dir, $dirname) {
+					$filepath = "\${$dirname} . '"
+						. DIRECTORY_SEPARATOR
+						. ltrim(str_replace($dir, '', $filepath), DIRECTORY_SEPARATOR) . "'";
+				}
+			);
+
+			ob_start();
+
+			echo "<?php\n\n";
+			echo "// {$output_filename} @generated by Strauss\n\n";
+			echo "\${$dirname} = dirname(__FILE__);\n\n";
+			echo "return array(\n";
+			foreach ($dirMap as $class => $file) {
+				echo "   '{$class}' => {$file},\n";
+			}
+			echo ");";
+
+			file_put_contents($dir . $output_filename, ob_get_clean());
+		}
+
+		return $dirname;
+	}
+
+	protected function generateFilesAutoloader()
+	{
+
+		// Hyphen used to match WordPress Coding Standards.
+		$outputFilename = "autoload-files.php";
+
+		$filesAutoloaders = $this->discoveredFilesAutoloaders;
+
+		if (empty($filesAutoloaders)) {
+			return;
+		}
+
+		$targetDirectory = getcwd()
+			. DIRECTORY_SEPARATOR
+			. ltrim($this->config->getTargetDirectory(), DIRECTORY_SEPARATOR);
 
-            $dirMap = ClassMapGenerator::createMap($dir);
+		$dirname = preg_replace('/[^a-z]/i', '', str_replace(getcwd(), '', $targetDirectory));
 
-            $dirname = preg_replace('/[^a-z]/i', '', str_replace(getcwd(), '', $dir));
+		ob_start();
 
-            array_walk(
-                $dirMap,
-                function (&$filepath, $_class) use ($dir, $dirname) {
-                    $filepath = "\${$dirname} . '"
-                        . DIRECTORY_SEPARATOR
-                        . ltrim(str_replace($dir, '', $filepath), DIRECTORY_SEPARATOR) . "'";
-                }
-            );
-
-            ob_start();
+		echo "<?php\n\n";
+		echo "// {$outputFilename} @generated by Strauss\n";
+		echo "// @see https://github.com/BrianHenryIE/strauss/\n\n";
 
-            echo "<?php\n\n";
-            echo "// {$output_filename} @generated by Strauss\n\n";
-            echo "\${$dirname} = dirname(__FILE__);\n\n";
-            echo "return array(\n";
-            foreach ($dirMap as $class => $file) {
-                echo "   '{$class}' => {$file},\n";
-            }
-            echo ");";
+		foreach ($filesAutoloaders as $packagePath => $files) {
+			foreach ($files as $file) {
+				$filepath = DIRECTORY_SEPARATOR . $packagePath . DIRECTORY_SEPARATOR . $file;
+				$filePathinfo = pathinfo(__DIR__ . $filepath);
+				if (!isset($filePathinfo['extension']) || 'php' !== $filePathinfo['extension']) {
+					continue;
+				}
+				echo "require_once __DIR__ . '{$filepath}';\n";
+			}
+		}
 
-            file_put_contents($dir . $output_filename, ob_get_clean());
-        }
+		file_put_contents($targetDirectory . $outputFilename, ob_get_clean());
+	}
 
-        return $dirname;
-    }
+	protected function generateAutoloadPhp()
+	{
 
-    protected function generateFilesAutoloader()
-    {
-
-        // Hyphen used to match WordPress Coding Standards.
-        $outputFilename = "autoload-files.php";
-
-        $filesAutoloaders = $this->discoveredFilesAutoloaders;
-
-        if (empty($filesAutoloaders)) {
-            return;
-        }
-
-        $targetDirectory = getcwd()
-            . DIRECTORY_SEPARATOR
-            . ltrim($this->config->getTargetDirectory(), DIRECTORY_SEPARATOR);
-
-        $dirname = preg_replace('/[^a-z]/i', '', str_replace(getcwd(), '', $targetDirectory));
-
-        ob_start();
-
-        echo "<?php\n\n";
-        echo "// {$outputFilename} @generated by Strauss\n";
-        echo "// @see https://github.com/BrianHenryIE/strauss/\n\n";
-
-        foreach ($filesAutoloaders as $packagePath => $files) {
-            foreach ($files as $file) {
-                $filepath = DIRECTORY_SEPARATOR . $packagePath . DIRECTORY_SEPARATOR . $file;
-                $filePathinfo = pathinfo(__DIR__ . $filepath);
-                if (!isset($filePathinfo['extension']) || 'php' !== $filePathinfo['extension']) {
-                    continue;
-                }
-                echo "require_once __DIR__ . '{$filepath}';\n";
-            }
-        }
-
-        file_put_contents($targetDirectory . $outputFilename, ob_get_clean());
-    }
-
-    protected function generateAutoloadPhp()
-    {
-
-        $autoloadPhp = <<<'EOD'
+		$autoloadPhp = <<<'EOD'
 <?php
 // autoload.php @generated by Strauss
 
@@ -183,9 +183,9 @@ 
 }
 EOD;
 
-        $relativeFilepath = $this->config->getTargetDirectory() . 'autoload.php';
-        $absoluteFilepath = $this->workingDir . $relativeFilepath;
+		$relativeFilepath = $this->config->getTargetDirectory() . 'autoload.php';
+		$absoluteFilepath = $this->workingDir . $relativeFilepath;
 
-        file_put_contents($absoluteFilepath, $autoloadPhp);
-    }
+		file_put_contents($absoluteFilepath, $autoloadPhp);
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -36,18 +36,18 @@ 
      * @param string $workingDir
      * @param array<string, array<string>> $files
      */
-    public function __construct(StraussConfig $config, string $workingDir, array $discoveredFilesAutoloaders)
+    public function __construct( StraussConfig $config, string $workingDir, array $discoveredFilesAutoloaders )
     {
         $this->config = $config;
         $this->workingDir = $workingDir;
         $this->discoveredFilesAutoloaders = $discoveredFilesAutoloaders;
-        $this->filesystem = new Filesystem(new Local($workingDir));
+        $this->filesystem = new Filesystem( new Local( $workingDir ) );
     }
 
     public function generate()
     {
 
-        if (! $this->config->isClassmapOutput()) {
+        if ( ! $this->config->isClassmapOutput() ) {
             return;
         }
 
@@ -76,7 +76,7 @@ 
 
         $targetDirectory = getcwd()
             . DIRECTORY_SEPARATOR
-            . ltrim($this->config->getTargetDirectory(), DIRECTORY_SEPARATOR);
+            . ltrim( $this->config->getTargetDirectory(), DIRECTORY_SEPARATOR );
 
         $dirs = array(
             $targetDirectory
@@ -84,21 +84,21 @@ 
 
         $dirname = '';
 
-        foreach ($dirs as $dir) {
-            if (!is_dir($dir)) {
+        foreach ( $dirs as $dir ) {
+            if ( ! is_dir( $dir ) ) {
                 continue;
             }
 
-            $dirMap = ClassMapGenerator::createMap($dir);
+            $dirMap = ClassMapGenerator::createMap( $dir );
 
-            $dirname = preg_replace('/[^a-z]/i', '', str_replace(getcwd(), '', $dir));
+            $dirname = preg_replace( '/[^a-z]/i', '', str_replace( getcwd(), '', $dir ) );
 
             array_walk(
                 $dirMap,
-                function (&$filepath, $_class) use ($dir, $dirname) {
+                function( &$filepath, $_class ) use ( $dir, $dirname ) {
                     $filepath = "\${$dirname} . '"
                         . DIRECTORY_SEPARATOR
-                        . ltrim(str_replace($dir, '', $filepath), DIRECTORY_SEPARATOR) . "'";
+                        . ltrim( str_replace( $dir, '', $filepath ), DIRECTORY_SEPARATOR ) . "'";
                 }
             );
 
@@ -108,12 +108,12 @@ 
             echo "// {$output_filename} @generated by Strauss\n\n";
             echo "\${$dirname} = dirname(__FILE__);\n\n";
             echo "return array(\n";
-            foreach ($dirMap as $class => $file) {
+            foreach ( $dirMap as $class => $file ) {
                 echo "   '{$class}' => {$file},\n";
             }
             echo ");";
 
-            file_put_contents($dir . $output_filename, ob_get_clean());
+            file_put_contents( $dir . $output_filename, ob_get_clean() );
         }
 
         return $dirname;
@@ -127,15 +127,15 @@ 
 
         $filesAutoloaders = $this->discoveredFilesAutoloaders;
 
-        if (empty($filesAutoloaders)) {
+        if ( empty( $filesAutoloaders ) ) {
             return;
         }
 
         $targetDirectory = getcwd()
             . DIRECTORY_SEPARATOR
-            . ltrim($this->config->getTargetDirectory(), DIRECTORY_SEPARATOR);
+            . ltrim( $this->config->getTargetDirectory(), DIRECTORY_SEPARATOR );
 
-        $dirname = preg_replace('/[^a-z]/i', '', str_replace(getcwd(), '', $targetDirectory));
+        $dirname = preg_replace( '/[^a-z]/i', '', str_replace( getcwd(), '', $targetDirectory ) );
 
         ob_start();
 
@@ -143,18 +143,18 @@ 
         echo "// {$outputFilename} @generated by Strauss\n";
         echo "// @see https://github.com/BrianHenryIE/strauss/\n\n";
 
-        foreach ($filesAutoloaders as $packagePath => $files) {
-            foreach ($files as $file) {
+        foreach ( $filesAutoloaders as $packagePath => $files ) {
+            foreach ( $files as $file ) {
                 $filepath = DIRECTORY_SEPARATOR . $packagePath . DIRECTORY_SEPARATOR . $file;
-                $filePathinfo = pathinfo(__DIR__ . $filepath);
-                if (!isset($filePathinfo['extension']) || 'php' !== $filePathinfo['extension']) {
+                $filePathinfo = pathinfo( __DIR__ . $filepath );
+                if ( ! isset( $filePathinfo[ 'extension' ] ) || 'php' !== $filePathinfo[ 'extension' ] ) {
                     continue;
                 }
                 echo "require_once __DIR__ . '{$filepath}';\n";
             }
         }
 
-        file_put_contents($targetDirectory . $outputFilename, ob_get_clean());
+        file_put_contents( $targetDirectory . $outputFilename, ob_get_clean() );
     }
 
     protected function generateAutoloadPhp()
@@ -186,6 +186,6 @@ 
         $relativeFilepath = $this->config->getTargetDirectory() . 'autoload.php';
         $absoluteFilepath = $this->workingDir . $relativeFilepath;
 
-        file_put_contents($absoluteFilepath, $autoloadPhp);
+        file_put_contents( $absoluteFilepath, $autoloadPhp );
     }
 }

Braces +5 added lines, -10 removed lines

@@ -12,8 +12,7 @@ 
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\Filesystem;
 
-class Autoload
-{
+class Autoload {
 
     /** @var Filesystem */
     protected $filesystem;
@@ -36,16 +35,14 @@ 
      * @param string $workingDir
      * @param array<string, array<string>> $files
      */
-    public function __construct(StraussConfig $config, string $workingDir, array $discoveredFilesAutoloaders)
-    {
+    public function __construct(StraussConfig $config, string $workingDir, array $discoveredFilesAutoloaders) {
         $this->config = $config;
         $this->workingDir = $workingDir;
         $this->discoveredFilesAutoloaders = $discoveredFilesAutoloaders;
         $this->filesystem = new Filesystem(new Local($workingDir));
     }
 
-    public function generate()
-    {
+    public function generate() {
 
         if (! $this->config->isClassmapOutput()) {
             return;
@@ -119,8 +116,7 @@ 
         return $dirname;
     }
 
-    protected function generateFilesAutoloader()
-    {
+    protected function generateFilesAutoloader() {
 
         // Hyphen used to match WordPress Coding Standards.
         $outputFilename = "autoload-files.php";
@@ -157,8 +153,7 @@ 
         file_put_contents($targetDirectory . $outputFilename, ob_get_clean());
     }
 
-    protected function generateAutoloadPhp()
-    {
+    protected function generateAutoloadPhp() {
 
         $autoloadPhp = <<<'EOD'
 <?php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 if ( file_exists( __DIR__ . '/autoload-files.php' ) ) {
     require_once __DIR__ . '/autoload-files.php';
 }
-EOD;
+eod;
 
         $relativeFilepath = $this->config->getTargetDirectory() . 'autoload.php';
         $absoluteFilepath = $this->workingDir . $relativeFilepath;

vendor/brianhenryie/strauss/src/Cleanup.php

Indentation +64 added lines, -64 removed lines

@@ -14,73 +14,73 @@
 class Cleanup
 {
 
-    /** @var Filesystem */
-    protected Filesystem $filesystem;
+	/** @var Filesystem */
+	protected Filesystem $filesystem;
 
-    protected bool $isDeleteVendorFiles;
+	protected bool $isDeleteVendorFiles;
 
-    protected string $vendorDirectory = 'vendor'. DIRECTORY_SEPARATOR;
+	protected string $vendorDirectory = 'vendor'. DIRECTORY_SEPARATOR;
     
-    public function __construct(StraussConfig $config, string $workingDir)
-    {
+	public function __construct(StraussConfig $config, string $workingDir)
+	{
 
-        $this->isDeleteVendorFiles = $config->isDeleteVendorFiles();
+		$this->isDeleteVendorFiles = $config->isDeleteVendorFiles();
         
-        $this->filesystem = new Filesystem(new Local($workingDir));
-    }
-
-    /**
-     * Maybe delete the source files that were copied (depending on config),
-     * then delete empty directories.
-     *
-     * @param array $sourceFiles
-     */
-    public function cleanup(array $sourceFiles)
-    {
-
-        // TODO Don't do this if vendor is the target dir (i.e. in-situ updating).
-
-        if ($this->isDeleteVendorFiles) {
-            foreach ($sourceFiles as $sourceFile) {
-                $relativeFilepath = $this->vendorDirectory . $sourceFile;
-
-                $this->filesystem->delete($relativeFilepath);
-            }
-
-            // Get the root folders of the moved files.
-            $rootSourceDirectories = [];
-            foreach ($sourceFiles as $sourceFile) {
-                $arr = explode("/", $sourceFile, 2);
-                $dir = $arr[0];
-                $rootSourceDirectories[ $dir ] = $dir;
-            }
-            $rootSourceDirectories = array_keys($rootSourceDirectories);
-
-
-            $finder = new Finder();
-
-            foreach ($rootSourceDirectories as $rootSourceDirectory) {
-                if (!is_dir($rootSourceDirectory) || is_link($rootSourceDirectory)) {
-                    continue;
-                }
-
-                $finder->directories()->path($rootSourceDirectory);
-
-                foreach ($finder as $directory) {
-                    $metadata = $this->filesystem->getMetadata($directory);
-
-                    if ($this->dirIsEmpty($directory)) {
-                        $this->filesystem->deleteDir($directory);
-                    }
-                }
-            }
-        }
-    }
-
-    // TODO: Use Symphony or Flysystem functions.
-    protected function dirIsEmpty(string $dir): bool
-    {
-        $di = new RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
-        return iterator_count($di) === 0;
-    }
+		$this->filesystem = new Filesystem(new Local($workingDir));
+	}
+
+	/**
+	 * Maybe delete the source files that were copied (depending on config),
+	 * then delete empty directories.
+	 *
+	 * @param array $sourceFiles
+	 */
+	public function cleanup(array $sourceFiles)
+	{
+
+		// TODO Don't do this if vendor is the target dir (i.e. in-situ updating).
+
+		if ($this->isDeleteVendorFiles) {
+			foreach ($sourceFiles as $sourceFile) {
+				$relativeFilepath = $this->vendorDirectory . $sourceFile;
+
+				$this->filesystem->delete($relativeFilepath);
+			}
+
+			// Get the root folders of the moved files.
+			$rootSourceDirectories = [];
+			foreach ($sourceFiles as $sourceFile) {
+				$arr = explode("/", $sourceFile, 2);
+				$dir = $arr[0];
+				$rootSourceDirectories[ $dir ] = $dir;
+			}
+			$rootSourceDirectories = array_keys($rootSourceDirectories);
+
+
+			$finder = new Finder();
+
+			foreach ($rootSourceDirectories as $rootSourceDirectory) {
+				if (!is_dir($rootSourceDirectory) || is_link($rootSourceDirectory)) {
+					continue;
+				}
+
+				$finder->directories()->path($rootSourceDirectory);
+
+				foreach ($finder as $directory) {
+					$metadata = $this->filesystem->getMetadata($directory);
+
+					if ($this->dirIsEmpty($directory)) {
+						$this->filesystem->deleteDir($directory);
+					}
+				}
+			}
+		}
+	}
+
+	// TODO: Use Symphony or Flysystem functions.
+	protected function dirIsEmpty(string $dir): bool
+	{
+		$di = new RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		return iterator_count($di) === 0;
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -19,14 +19,14 @@ 
 
     protected bool $isDeleteVendorFiles;
 
-    protected string $vendorDirectory = 'vendor'. DIRECTORY_SEPARATOR;
+    protected string $vendorDirectory = 'vendor' . DIRECTORY_SEPARATOR;
     
-    public function __construct(StraussConfig $config, string $workingDir)
+    public function __construct( StraussConfig $config, string $workingDir )
     {
 
         $this->isDeleteVendorFiles = $config->isDeleteVendorFiles();
         
-        $this->filesystem = new Filesystem(new Local($workingDir));
+        $this->filesystem = new Filesystem( new Local( $workingDir ) );
     }
 
     /**
@@ -35,42 +35,42 @@ 
      *
      * @param array $sourceFiles
      */
-    public function cleanup(array $sourceFiles)
+    public function cleanup( array $sourceFiles )
     {
 
         // TODO Don't do this if vendor is the target dir (i.e. in-situ updating).
 
-        if ($this->isDeleteVendorFiles) {
-            foreach ($sourceFiles as $sourceFile) {
+        if ( $this->isDeleteVendorFiles ) {
+            foreach ( $sourceFiles as $sourceFile ) {
                 $relativeFilepath = $this->vendorDirectory . $sourceFile;
 
-                $this->filesystem->delete($relativeFilepath);
+                $this->filesystem->delete( $relativeFilepath );
             }
 
             // Get the root folders of the moved files.
-            $rootSourceDirectories = [];
-            foreach ($sourceFiles as $sourceFile) {
-                $arr = explode("/", $sourceFile, 2);
-                $dir = $arr[0];
+            $rootSourceDirectories = [ ];
+            foreach ( $sourceFiles as $sourceFile ) {
+                $arr = explode( "/", $sourceFile, 2 );
+                $dir = $arr[ 0 ];
                 $rootSourceDirectories[ $dir ] = $dir;
             }
-            $rootSourceDirectories = array_keys($rootSourceDirectories);
+            $rootSourceDirectories = array_keys( $rootSourceDirectories );
 
 
             $finder = new Finder();
 
-            foreach ($rootSourceDirectories as $rootSourceDirectory) {
-                if (!is_dir($rootSourceDirectory) || is_link($rootSourceDirectory)) {
+            foreach ( $rootSourceDirectories as $rootSourceDirectory ) {
+                if ( ! is_dir( $rootSourceDirectory ) || is_link( $rootSourceDirectory ) ) {
                     continue;
                 }
 
-                $finder->directories()->path($rootSourceDirectory);
+                $finder->directories()->path( $rootSourceDirectory );
 
-                foreach ($finder as $directory) {
-                    $metadata = $this->filesystem->getMetadata($directory);
+                foreach ( $finder as $directory ) {
+                    $metadata = $this->filesystem->getMetadata( $directory );
 
-                    if ($this->dirIsEmpty($directory)) {
-                        $this->filesystem->deleteDir($directory);
+                    if ( $this->dirIsEmpty( $directory ) ) {
+                        $this->filesystem->deleteDir( $directory );
                     }
                 }
             }
@@ -78,9 +78,9 @@ 
     }
 
     // TODO: Use Symphony or Flysystem functions.
-    protected function dirIsEmpty(string $dir): bool
+    protected function dirIsEmpty( string $dir ): bool
     {
-        $di = new RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
-        return iterator_count($di) === 0;
+        $di = new RecursiveDirectoryIterator( $dir, \FilesystemIterator::SKIP_DOTS );
+        return iterator_count( $di ) === 0;
     }
 }

Braces +3 added lines, -6 removed lines

@@ -11,8 +11,7 @@ 
 use RecursiveDirectoryIterator;
 use Symfony\Component\Finder\Finder;
 
-class Cleanup
-{
+class Cleanup {
 
     /** @var Filesystem */
     protected Filesystem $filesystem;
@@ -21,8 +20,7 @@ 
 
     protected string $vendorDirectory = 'vendor'. DIRECTORY_SEPARATOR;
     
-    public function __construct(StraussConfig $config, string $workingDir)
-    {
+    public function __construct(StraussConfig $config, string $workingDir) {
 
         $this->isDeleteVendorFiles = $config->isDeleteVendorFiles();
         
@@ -35,8 +33,7 @@ 
      *
      * @param array $sourceFiles
      */
-    public function cleanup(array $sourceFiles)
-    {
+    public function cleanup(array $sourceFiles) {
 
         // TODO Don't do this if vendor is the target dir (i.e. in-situ updating).
 

vendor/brianhenryie/strauss/src/FileEnumerator.php

Indentation +175 added lines, -175 removed lines

@@ -16,180 +16,180 @@
 class FileEnumerator
 {
 
-    /**
-     * The only path variable with a leading slash.
-     * All directories in project end with a slash.
-     *
-     * @var string
-     */
-    protected string $workingDir;
-
-    /** @var ComposerPackage[] */
-    protected array $dependencies;
-
-    protected array $excludePackageNames = array();
-    protected array $excludeNamespaces = array();
-    protected array $excludeFilePatterns = array();
-
-    /** @var Filesystem */
-    protected Filesystem $filesystem;
-
-    /**
-     * Complete list of files specified in packages autoloaders.
-     *
-     * Relative filepaths as key, with their dependency as the value.
-     *
-     * Relative from vendor/
-     *
-     * @var array<string, ComposerPackage>
-     */
-    protected array $filesWithDependencies = [];
-
-    /**
-     * Record the files autolaoders for later use in building our own autoloader.
-     *
-     * @var array
-     */
-    protected array $filesAutoloaders = [];
-
-    /**
-     * Copier constructor.
-     * @param ComposerPackage[] $dependencies
-     * @param string $workingDir
-     */
-    public function __construct(
-        array $dependencies,
-        string $workingDir,
-        StraussConfig $config
-    ) {
-        $this->workingDir = $workingDir;
-
-        $this->dependencies = $dependencies;
-
-        $this->excludeNamespaces = $config->getExcludeNamespacesFromCopy();
-        $this->excludePackageNames = $config->getExcludePackagesFromCopy();
-        $this->excludeFilePatterns = $config->getExcludeFilePatternsFromCopy();
-
-        $this->filesystem = new Filesystem(new Local($this->workingDir));
-    }
-
-    /**
-     * Read the autoload keys of the dependencies and generate a list of the files referenced.
-     */
-    public function compileFileList()
-    {
-
-        // TODO: read 'vendor' from composer.json.
-        $prefixToRemove = $this->workingDir .'vendor'. DIRECTORY_SEPARATOR;
-
-        foreach ($this->dependencies as $dependency) {
-            if (in_array($dependency->getName(), $this->excludePackageNames)) {
-                continue;
-            }
-
-            $packagePath = $this->workingDir . 'vendor' . DIRECTORY_SEPARATOR
-                . $dependency->getPath() . DIRECTORY_SEPARATOR;
-
-            /**
-             * Where $dependency->autoload is ~
-             *
-             * [ "psr-4" => [ "BrianHenryIE\Strauss" => "src" ] ]
-             * Exclude "exclude-from-classmap"
-             * @see https://getcomposer.org/doc/04-schema.md#exclude-files-from-classmaps
-             */
-            $autoloaders = array_filter($dependency->getAutoload(), function ($type) {
-                return 'exclude-from-classmap' !== $type;
-            }, ARRAY_FILTER_USE_KEY);
-
-            foreach ($autoloaders as $type => $value) {
-                // Might have to switch/case here.
-
-                if ('files' === $type) {
-                    $this->filesAutoloaders[$dependency->getPath()] = $value;
-                }
-
-                foreach ($value as $namespace => $namespace_relative_path) {
-                    if (!empty($namespace) && in_array($namespace, $this->excludeNamespaces)) {
-                        continue;
-                    }
-
-                    if (is_file($packagePath . $namespace_relative_path)) {
-                        //  $finder->files()->name($file)->in($source_path);
-
-                        $relativeFilepath = str_replace($prefixToRemove, '', $packagePath . $namespace_relative_path);
-                        $relativeFilepath = preg_replace('#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath);
+	/**
+	 * The only path variable with a leading slash.
+	 * All directories in project end with a slash.
+	 *
+	 * @var string
+	 */
+	protected string $workingDir;
+
+	/** @var ComposerPackage[] */
+	protected array $dependencies;
+
+	protected array $excludePackageNames = array();
+	protected array $excludeNamespaces = array();
+	protected array $excludeFilePatterns = array();
+
+	/** @var Filesystem */
+	protected Filesystem $filesystem;
+
+	/**
+	 * Complete list of files specified in packages autoloaders.
+	 *
+	 * Relative filepaths as key, with their dependency as the value.
+	 *
+	 * Relative from vendor/
+	 *
+	 * @var array<string, ComposerPackage>
+	 */
+	protected array $filesWithDependencies = [];
+
+	/**
+	 * Record the files autolaoders for later use in building our own autoloader.
+	 *
+	 * @var array
+	 */
+	protected array $filesAutoloaders = [];
+
+	/**
+	 * Copier constructor.
+	 * @param ComposerPackage[] $dependencies
+	 * @param string $workingDir
+	 */
+	public function __construct(
+		array $dependencies,
+		string $workingDir,
+		StraussConfig $config
+	) {
+		$this->workingDir = $workingDir;
+
+		$this->dependencies = $dependencies;
+
+		$this->excludeNamespaces = $config->getExcludeNamespacesFromCopy();
+		$this->excludePackageNames = $config->getExcludePackagesFromCopy();
+		$this->excludeFilePatterns = $config->getExcludeFilePatternsFromCopy();
+
+		$this->filesystem = new Filesystem(new Local($this->workingDir));
+	}
+
+	/**
+	 * Read the autoload keys of the dependencies and generate a list of the files referenced.
+	 */
+	public function compileFileList()
+	{
+
+		// TODO: read 'vendor' from composer.json.
+		$prefixToRemove = $this->workingDir .'vendor'. DIRECTORY_SEPARATOR;
+
+		foreach ($this->dependencies as $dependency) {
+			if (in_array($dependency->getName(), $this->excludePackageNames)) {
+				continue;
+			}
+
+			$packagePath = $this->workingDir . 'vendor' . DIRECTORY_SEPARATOR
+				. $dependency->getPath() . DIRECTORY_SEPARATOR;
+
+			/**
+			 * Where $dependency->autoload is ~
+			 *
+			 * [ "psr-4" => [ "BrianHenryIE\Strauss" => "src" ] ]
+			 * Exclude "exclude-from-classmap"
+			 * @see https://getcomposer.org/doc/04-schema.md#exclude-files-from-classmaps
+			 */
+			$autoloaders = array_filter($dependency->getAutoload(), function ($type) {
+				return 'exclude-from-classmap' !== $type;
+			}, ARRAY_FILTER_USE_KEY);
+
+			foreach ($autoloaders as $type => $value) {
+				// Might have to switch/case here.
+
+				if ('files' === $type) {
+					$this->filesAutoloaders[$dependency->getPath()] = $value;
+				}
+
+				foreach ($value as $namespace => $namespace_relative_path) {
+					if (!empty($namespace) && in_array($namespace, $this->excludeNamespaces)) {
+						continue;
+					}
+
+					if (is_file($packagePath . $namespace_relative_path)) {
+						//  $finder->files()->name($file)->in($source_path);
+
+						$relativeFilepath = str_replace($prefixToRemove, '', $packagePath . $namespace_relative_path);
+						$relativeFilepath = preg_replace('#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath);
                         
-                        $this->filesWithDependencies[$relativeFilepath] = $dependency;
-
-                        continue;
-                    }
-
-                    // else it is a directory.
-
-                    // trailingslashit().
-                    $namespace_relative_path = rtrim($namespace_relative_path, DIRECTORY_SEPARATOR)
-                        . DIRECTORY_SEPARATOR;
-
-                    $sourcePath = $packagePath . $namespace_relative_path;
-
-                    // trailingslashit(). (to remove duplicates).
-                    $sourcePath = rtrim($sourcePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-                    $finder = new Finder();
-                    $finder->files()->in($sourcePath)->followLinks();
-
-                    foreach ($finder as $foundFile) {
-                        $filePath = $foundFile->getPathname();
-
-                        $relativeFilepath = str_replace($prefixToRemove, '', $filePath);
-
-                        // TODO: Is this needed here?! If anything, it's the prefix that needs to be normalised a few
-                        // lines above before being used.
-                        // Replace multiple \ and/or / with OS native DIRECTORY_SEPARATOR.
-                        $relativeFilepath = preg_replace('#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath);
-
-                        foreach ($this->excludeFilePatterns as $excludePattern) {
-                            if (1 === preg_match($excludePattern, $relativeFilepath)) {
-                                continue 2;
-                            }
-                        }
-
-                        $this->filesWithDependencies[$relativeFilepath] = $dependency;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns all found files.
-     *
-     * @return array<string, ComposerPackage>
-     */
-    public function getAllFilesAndDependencyList(): array
-    {
-        return $this->filesWithDependencies;
-    }
-
-    /**
-     * Returns found PHP files.
-     *
-     * @return array<string, ComposerPackage>
-     */
-    public function getPhpFilesAndDependencyList(): array
-    {
-        return array_filter($this->filesWithDependencies, function ($value, $key) {
-            return false !== strpos($key, '.php');
-        }, ARRAY_FILTER_USE_BOTH);
-    }
-
-    /**
-     * Get the recorded files autoloaders.
-     *
-     * @return array<string, array<string>>
-     */
-    public function getFilesAutoloaders(): array
-    {
-        return $this->filesAutoloaders;
-    }
+						$this->filesWithDependencies[$relativeFilepath] = $dependency;
+
+						continue;
+					}
+
+					// else it is a directory.
+
+					// trailingslashit().
+					$namespace_relative_path = rtrim($namespace_relative_path, DIRECTORY_SEPARATOR)
+						. DIRECTORY_SEPARATOR;
+
+					$sourcePath = $packagePath . $namespace_relative_path;
+
+					// trailingslashit(). (to remove duplicates).
+					$sourcePath = rtrim($sourcePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+					$finder = new Finder();
+					$finder->files()->in($sourcePath)->followLinks();
+
+					foreach ($finder as $foundFile) {
+						$filePath = $foundFile->getPathname();
+
+						$relativeFilepath = str_replace($prefixToRemove, '', $filePath);
+
+						// TODO: Is this needed here?! If anything, it's the prefix that needs to be normalised a few
+						// lines above before being used.
+						// Replace multiple \ and/or / with OS native DIRECTORY_SEPARATOR.
+						$relativeFilepath = preg_replace('#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath);
+
+						foreach ($this->excludeFilePatterns as $excludePattern) {
+							if (1 === preg_match($excludePattern, $relativeFilepath)) {
+								continue 2;
+							}
+						}
+
+						$this->filesWithDependencies[$relativeFilepath] = $dependency;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns all found files.
+	 *
+	 * @return array<string, ComposerPackage>
+	 */
+	public function getAllFilesAndDependencyList(): array
+	{
+		return $this->filesWithDependencies;
+	}
+
+	/**
+	 * Returns found PHP files.
+	 *
+	 * @return array<string, ComposerPackage>
+	 */
+	public function getPhpFilesAndDependencyList(): array
+	{
+		return array_filter($this->filesWithDependencies, function ($value, $key) {
+			return false !== strpos($key, '.php');
+		}, ARRAY_FILTER_USE_BOTH);
+	}
+
+	/**
+	 * Get the recorded files autoloaders.
+	 *
+	 * @return array<string, array<string>>
+	 */
+	public function getFilesAutoloaders(): array
+	{
+		return $this->filesAutoloaders;
+	}
 }

Spacing +29 added lines, -29 removed lines

@@ -43,14 +43,14 @@ 
      *
      * @var array<string, ComposerPackage>
      */
-    protected array $filesWithDependencies = [];
+    protected array $filesWithDependencies = [ ];
 
     /**
      * Record the files autolaoders for later use in building our own autoloader.
      *
      * @var array
      */
-    protected array $filesAutoloaders = [];
+    protected array $filesAutoloaders = [ ];
 
     /**
      * Copier constructor.
@@ -70,7 +70,7 @@ 
         $this->excludePackageNames = $config->getExcludePackagesFromCopy();
         $this->excludeFilePatterns = $config->getExcludeFilePatternsFromCopy();
 
-        $this->filesystem = new Filesystem(new Local($this->workingDir));
+        $this->filesystem = new Filesystem( new Local( $this->workingDir ) );
     }
 
     /**
@@ -80,10 +80,10 @@ 
     {
 
         // TODO: read 'vendor' from composer.json.
-        $prefixToRemove = $this->workingDir .'vendor'. DIRECTORY_SEPARATOR;
+        $prefixToRemove = $this->workingDir . 'vendor' . DIRECTORY_SEPARATOR;
 
-        foreach ($this->dependencies as $dependency) {
-            if (in_array($dependency->getName(), $this->excludePackageNames)) {
+        foreach ( $this->dependencies as $dependency ) {
+            if ( in_array( $dependency->getName(), $this->excludePackageNames ) ) {
                 continue;
             }
 
@@ -97,29 +97,29 @@ 
              * Exclude "exclude-from-classmap"
              * @see https://getcomposer.org/doc/04-schema.md#exclude-files-from-classmaps
              */
-            $autoloaders = array_filter($dependency->getAutoload(), function ($type) {
+            $autoloaders = array_filter( $dependency->getAutoload(), function( $type ) {
                 return 'exclude-from-classmap' !== $type;
-            }, ARRAY_FILTER_USE_KEY);
+            }, ARRAY_FILTER_USE_KEY );
 
-            foreach ($autoloaders as $type => $value) {
+            foreach ( $autoloaders as $type => $value ) {
                 // Might have to switch/case here.
 
-                if ('files' === $type) {
-                    $this->filesAutoloaders[$dependency->getPath()] = $value;
+                if ( 'files' === $type ) {
+                    $this->filesAutoloaders[ $dependency->getPath() ] = $value;
                 }
 
-                foreach ($value as $namespace => $namespace_relative_path) {
-                    if (!empty($namespace) && in_array($namespace, $this->excludeNamespaces)) {
+                foreach ( $value as $namespace => $namespace_relative_path ) {
+                    if ( ! empty( $namespace ) && in_array( $namespace, $this->excludeNamespaces ) ) {
                         continue;
                     }
 
-                    if (is_file($packagePath . $namespace_relative_path)) {
+                    if ( is_file( $packagePath . $namespace_relative_path ) ) {
                         //  $finder->files()->name($file)->in($source_path);
 
-                        $relativeFilepath = str_replace($prefixToRemove, '', $packagePath . $namespace_relative_path);
-                        $relativeFilepath = preg_replace('#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath);
+                        $relativeFilepath = str_replace( $prefixToRemove, '', $packagePath . $namespace_relative_path );
+                        $relativeFilepath = preg_replace( '#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath );
                         
-                        $this->filesWithDependencies[$relativeFilepath] = $dependency;
+                        $this->filesWithDependencies[ $relativeFilepath ] = $dependency;
 
                         continue;
                     }
@@ -127,34 +127,34 @@ 
                     // else it is a directory.
 
                     // trailingslashit().
-                    $namespace_relative_path = rtrim($namespace_relative_path, DIRECTORY_SEPARATOR)
+                    $namespace_relative_path = rtrim( $namespace_relative_path, DIRECTORY_SEPARATOR )
                         . DIRECTORY_SEPARATOR;
 
                     $sourcePath = $packagePath . $namespace_relative_path;
 
                     // trailingslashit(). (to remove duplicates).
-                    $sourcePath = rtrim($sourcePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+                    $sourcePath = rtrim( $sourcePath, DIRECTORY_SEPARATOR ) . DIRECTORY_SEPARATOR;
 
                     $finder = new Finder();
-                    $finder->files()->in($sourcePath)->followLinks();
+                    $finder->files()->in( $sourcePath )->followLinks();
 
-                    foreach ($finder as $foundFile) {
+                    foreach ( $finder as $foundFile ) {
                         $filePath = $foundFile->getPathname();
 
-                        $relativeFilepath = str_replace($prefixToRemove, '', $filePath);
+                        $relativeFilepath = str_replace( $prefixToRemove, '', $filePath );
 
                         // TODO: Is this needed here?! If anything, it's the prefix that needs to be normalised a few
                         // lines above before being used.
                         // Replace multiple \ and/or / with OS native DIRECTORY_SEPARATOR.
-                        $relativeFilepath = preg_replace('#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath);
+                        $relativeFilepath = preg_replace( '#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath );
 
-                        foreach ($this->excludeFilePatterns as $excludePattern) {
-                            if (1 === preg_match($excludePattern, $relativeFilepath)) {
+                        foreach ( $this->excludeFilePatterns as $excludePattern ) {
+                            if ( 1 === preg_match( $excludePattern, $relativeFilepath ) ) {
                                 continue 2;
                             }
                         }
 
-                        $this->filesWithDependencies[$relativeFilepath] = $dependency;
+                        $this->filesWithDependencies[ $relativeFilepath ] = $dependency;
                     }
                 }
             }
@@ -178,9 +178,9 @@ 
      */
     public function getPhpFilesAndDependencyList(): array
     {
-        return array_filter($this->filesWithDependencies, function ($value, $key) {
-            return false !== strpos($key, '.php');
-        }, ARRAY_FILTER_USE_BOTH);
+        return array_filter( $this->filesWithDependencies, function( $value, $key ) {
+            return false !== strpos( $key, '.php' );
+        }, ARRAY_FILTER_USE_BOTH );
     }
 
     /**

Braces +2 added lines, -4 removed lines

@@ -13,8 +13,7 @@ 
 use League\Flysystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 
-class FileEnumerator
-{
+class FileEnumerator {
 
     /**
      * The only path variable with a leading slash.
@@ -76,8 +75,7 @@ 
     /**
      * Read the autoload keys of the dependencies and generate a list of the files referenced.
      */
-    public function compileFileList()
-    {
+    public function compileFileList() {
 
         // TODO: read 'vendor' from composer.json.
         $prefixToRemove = $this->workingDir .'vendor'. DIRECTORY_SEPARATOR;