gravityview / GravityView

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;

vendor/brianhenryie/strauss/src/Licenser.php

Indentation +191 added lines, -191 removed lines

@@ -25,170 +25,170 @@ 
 class Licenser
 {
 
-    protected string $workingDir;
+	protected string $workingDir;
 
-    protected array $dependencies;
+	protected array $dependencies;
 
-    // The author of the current project who is running Strauss to make the changes to the required libraries.
-    protected string $author;
+	// The author of the current project who is running Strauss to make the changes to the required libraries.
+	protected string $author;
 
-    protected string $targetDirectory;
+	protected string $targetDirectory;
 
-    /**
-     * An array of files relative to the project vendor folder.
-     *
-     * @var string[]
-     */
-    protected array $discoveredLicenseFiles = array();
+	/**
+	 * An array of files relative to the project vendor folder.
+	 *
+	 * @var string[]
+	 */
+	protected array $discoveredLicenseFiles = array();
 
-    /** @var Filesystem */
-    protected $filesystem;
+	/** @var Filesystem */
+	protected $filesystem;
 
 
-    /**
-     * Licenser constructor.
-     * @param string $workingDir
-     * @param array $dependencies Whose folders are searched for existing license.txt files.
-     * @param string $author To add to each modified file's header
-     */
-    public function __construct(StraussConfig $config, string $workingDir, array $dependencies, string $author)
-    {
-        $this->workingDir = $workingDir;
-        $this->dependencies = $dependencies;
-        $this->author = $author;
+	/**
+	 * Licenser constructor.
+	 * @param string $workingDir
+	 * @param array $dependencies Whose folders are searched for existing license.txt files.
+	 * @param string $author To add to each modified file's header
+	 */
+	public function __construct(StraussConfig $config, string $workingDir, array $dependencies, string $author)
+	{
+		$this->workingDir = $workingDir;
+		$this->dependencies = $dependencies;
+		$this->author = $author;
 
-        $this->targetDirectory = $config->getTargetDirectory();
+		$this->targetDirectory = $config->getTargetDirectory();
 
-        $this->filesystem = new Filesystem(new Local($workingDir));
-    }
+		$this->filesystem = new Filesystem(new Local($workingDir));
+	}
 
-    public function copyLicenses(): void
-    {
-        $this->findLicenseFiles();
-
-        foreach ($this->getDiscoveredLicenseFiles() as $licenseFile) {
-            $targetLicenseFile = $this->targetDirectory . $licenseFile;
-
-            $targetLicenseFileDir = dirname($targetLicenseFile);
-
-            // Don't try copy it if it's already there.
-            if ($this->filesystem->has($targetLicenseFile)) {
-                continue;
-            }
-
-            // Don't add licenses to non-existent directories – there were no files copied there!
-            if (! $this->filesystem->has($targetLicenseFileDir)) {
-                continue;
-            }
-
-            $this->filesystem->copy(
-                'vendor' . DIRECTORY_SEPARATOR . $licenseFile,
-                $targetLicenseFile
-            );
-        }
-    }
-
-
-    /**
-     * @see https://www.phpliveregex.com/p/A5y
-     */
-    public function findLicenseFiles(?Finder $finder = null)
-    {
-
-        // Include all license files in the dependency path.
-        $finder = $finder ?? new Finder();
-
-        // TODO: read 'vendor' from composer.json.
-        $prefixToRemove = 'vendor' . DIRECTORY_SEPARATOR;
-
-        /** @var ComposerPackage $dependency */
-        foreach ($this->dependencies as $dependency) {
-            $packagePath = 'vendor' . DIRECTORY_SEPARATOR . $dependency->getPath();
-
-            // If packages happen to have their vendor dir, i.e. locally required packages, don't included the licenses
-            // from their vendor dir (they should be included otherwise anyway).
-            // $dependency->getVendorDir()
-            $finder->files()->in($packagePath)->followLinks()->exclude(array( 'vendor' ))->name('/^.*licen.e.*/i');
-
-            /** @var \SplFileInfo $foundFile */
-            foreach ($finder as $foundFile) {
-                $filePath = $foundFile->getPathname();
-
-                $relativeFilepath = str_replace($prefixToRemove, '', $filePath);
-
-                // Replace multiple \ and/or / with OS native DIRECTORY_SEPARATOR.
-                $relativeFilepath = preg_replace('#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath);
-
-                $this->discoveredLicenseFiles[$relativeFilepath] = $dependency->getName();
-            }
-        }
-    }
-
-    public function getDiscoveredLicenseFiles(): array
-    {
-        return array_keys($this->discoveredLicenseFiles);
-    }
-
-    /**
-     * @param array<string, ComposerPackage> $modifiedFiles
-     */
-    public function addInformationToUpdatedFiles(array $modifiedFiles)
-    {
-
-        // e.g. "25-April-2021".
-        $date = gmdate("d-F-Y", time());
-
-        foreach ($modifiedFiles as $relativeFilePath => $package) {
-            $filepath = $this->targetDirectory . $relativeFilePath;
-
-            $packageLicense = $package->getLicense();
-
-            // Throws an exception, but unlikely to happen.
-            $contents = $this->filesystem->read($filepath);
-
-            $updatedContents = $this->addChangeDeclarationToPhpString($contents, $date, $packageLicense);
-
-            if ($updatedContents !== $contents) {
-                $this->filesystem->put($filepath, $updatedContents);
-            }
-        }
-    }
-
-    /**
-     * Given a php file as a string, edit it's header phpdoc, or add a header, to include:
-     *
-     * "Modified by {author} on {date} using Strauss.
-     * @see https://github.com/BrianHenryIE/strauss"
-     *
-     * Should probably include the original license in each file since it'll often be a mix, with the parent
-     * project often being a GPL WordPress plugin.
-     *
-     * Find the string between the end of php-opener and the first valid code.
-     * First valid code will be a line whose first non-whitespace character is not / or * ?... NO!
-     * If the first non whitespace string after php-opener is multiline-comment-opener, find the
-     * closing multiline-comment-closer
-     * / If there's already a comment, work within that comment
-     * If there is no mention in the header of the license already, add it.
-     * Add a note that changes have been made.
-     *
-     * @param string $phpString Code.
-     */
-    public function addChangeDeclarationToPhpString(
-        string $phpString,
-        string $modifiedDate,
-        string $packageLicense
-    ) : string {
-
-        $author = $this->author;
-
-        $licenseDeclaration = "@license {$packageLicense}";
-        $modifiedDeclaration = "Modified by {$author} on {$modifiedDate} using Strauss.";
-        $straussLink = "@see https://github.com/BrianHenryIE/strauss";
-
-        // php-open followed by some whitespace and new line until the first ...
-        $noCommentBetweenPhpOpenAndFirstCodePattern = '~<\?php[\s\n]*[\w\\\?]+~';
-
-        $multilineCommentCapturePattern = '
+	public function copyLicenses(): void
+	{
+		$this->findLicenseFiles();
+
+		foreach ($this->getDiscoveredLicenseFiles() as $licenseFile) {
+			$targetLicenseFile = $this->targetDirectory . $licenseFile;
+
+			$targetLicenseFileDir = dirname($targetLicenseFile);
+
+			// Don't try copy it if it's already there.
+			if ($this->filesystem->has($targetLicenseFile)) {
+				continue;
+			}
+
+			// Don't add licenses to non-existent directories – there were no files copied there!
+			if (! $this->filesystem->has($targetLicenseFileDir)) {
+				continue;
+			}
+
+			$this->filesystem->copy(
+				'vendor' . DIRECTORY_SEPARATOR . $licenseFile,
+				$targetLicenseFile
+			);
+		}
+	}
+
+
+	/**
+	 * @see https://www.phpliveregex.com/p/A5y
+	 */
+	public function findLicenseFiles(?Finder $finder = null)
+	{
+
+		// Include all license files in the dependency path.
+		$finder = $finder ?? new Finder();
+
+		// TODO: read 'vendor' from composer.json.
+		$prefixToRemove = 'vendor' . DIRECTORY_SEPARATOR;
+
+		/** @var ComposerPackage $dependency */
+		foreach ($this->dependencies as $dependency) {
+			$packagePath = 'vendor' . DIRECTORY_SEPARATOR . $dependency->getPath();
+
+			// If packages happen to have their vendor dir, i.e. locally required packages, don't included the licenses
+			// from their vendor dir (they should be included otherwise anyway).
+			// $dependency->getVendorDir()
+			$finder->files()->in($packagePath)->followLinks()->exclude(array( 'vendor' ))->name('/^.*licen.e.*/i');
+
+			/** @var \SplFileInfo $foundFile */
+			foreach ($finder as $foundFile) {
+				$filePath = $foundFile->getPathname();
+
+				$relativeFilepath = str_replace($prefixToRemove, '', $filePath);
+
+				// Replace multiple \ and/or / with OS native DIRECTORY_SEPARATOR.
+				$relativeFilepath = preg_replace('#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath);
+
+				$this->discoveredLicenseFiles[$relativeFilepath] = $dependency->getName();
+			}
+		}
+	}
+
+	public function getDiscoveredLicenseFiles(): array
+	{
+		return array_keys($this->discoveredLicenseFiles);
+	}
+
+	/**
+	 * @param array<string, ComposerPackage> $modifiedFiles
+	 */
+	public function addInformationToUpdatedFiles(array $modifiedFiles)
+	{
+
+		// e.g. "25-April-2021".
+		$date = gmdate("d-F-Y", time());
+
+		foreach ($modifiedFiles as $relativeFilePath => $package) {
+			$filepath = $this->targetDirectory . $relativeFilePath;
+
+			$packageLicense = $package->getLicense();
+
+			// Throws an exception, but unlikely to happen.
+			$contents = $this->filesystem->read($filepath);
+
+			$updatedContents = $this->addChangeDeclarationToPhpString($contents, $date, $packageLicense);
+
+			if ($updatedContents !== $contents) {
+				$this->filesystem->put($filepath, $updatedContents);
+			}
+		}
+	}
+
+	/**
+	 * Given a php file as a string, edit it's header phpdoc, or add a header, to include:
+	 *
+	 * "Modified by {author} on {date} using Strauss.
+	 * @see https://github.com/BrianHenryIE/strauss"
+	 *
+	 * Should probably include the original license in each file since it'll often be a mix, with the parent
+	 * project often being a GPL WordPress plugin.
+	 *
+	 * Find the string between the end of php-opener and the first valid code.
+	 * First valid code will be a line whose first non-whitespace character is not / or * ?... NO!
+	 * If the first non whitespace string after php-opener is multiline-comment-opener, find the
+	 * closing multiline-comment-closer
+	 * / If there's already a comment, work within that comment
+	 * If there is no mention in the header of the license already, add it.
+	 * Add a note that changes have been made.
+	 *
+	 * @param string $phpString Code.
+	 */
+	public function addChangeDeclarationToPhpString(
+		string $phpString,
+		string $modifiedDate,
+		string $packageLicense
+	) : string {
+
+		$author = $this->author;
+
+		$licenseDeclaration = "@license {$packageLicense}";
+		$modifiedDeclaration = "Modified by {$author} on {$modifiedDate} using Strauss.";
+		$straussLink = "@see https://github.com/BrianHenryIE/strauss";
+
+		// php-open followed by some whitespace and new line until the first ...
+		$noCommentBetweenPhpOpenAndFirstCodePattern = '~<\?php[\s\n]*[\w\\\?]+~';
+
+		$multilineCommentCapturePattern = '
             ~                        # Start the pattern
             (
             <\?php[\S\s]*            #  match the beginning of the files php-open and following whitespace
@@ -202,51 +202,51 @@ 
             ~Ux';                          // U: Non-greedy matching, x: ignore whitespace in pattern.
 
 
-        $replaceInMultilineCommentFunction = function ($matches) use (
-            $licenseDeclaration,
-            $modifiedDeclaration,
-            $straussLink
-        ) {
+		$replaceInMultilineCommentFunction = function ($matches) use (
+			$licenseDeclaration,
+			$modifiedDeclaration,
+			$straussLink
+		) {
 
-            // Find the line prefix and use it, i.e. could be none, asterisk or space-asterisk.
-            $commentLines = explode("\n", $matches[2]);
+			// Find the line prefix and use it, i.e. could be none, asterisk or space-asterisk.
+			$commentLines = explode("\n", $matches[2]);
 
-            if (isset($commentLines[1])&& 1 === preg_match('/^([\s\\\*]*)/', $commentLines[1], $output_array)) {
-                $lineStart = $output_array[1];
-            } else {
-                $lineStart = ' * ';
-            }
+			if (isset($commentLines[1])&& 1 === preg_match('/^([\s\\\*]*)/', $commentLines[1], $output_array)) {
+				$lineStart = $output_array[1];
+			} else {
+				$lineStart = ' * ';
+			}
 
-            $appendString = "*\n";
+			$appendString = "*\n";
 
-            // If the license is not already specified in the header, add it.
-            if (false === strpos($matches[2], 'licen')) {
-                $appendString .= "{$lineStart}{$licenseDeclaration}\n";
-            }
+			// If the license is not already specified in the header, add it.
+			if (false === strpos($matches[2], 'licen')) {
+				$appendString .= "{$lineStart}{$licenseDeclaration}\n";
+			}
 
-            $appendString .= "{$lineStart}{$modifiedDeclaration}\n";
-            $appendString .= "{$lineStart}{$straussLink}\n";
+			$appendString .= "{$lineStart}{$modifiedDeclaration}\n";
+			$appendString .= "{$lineStart}{$straussLink}\n";
 
-            $commentEnd =  rtrim(rtrim($lineStart, ' '), '*').'*/';
+			$commentEnd =  rtrim(rtrim($lineStart, ' '), '*').'*/';
 
-            $replaceWith = $matches[1] . $matches[2] . $appendString . $commentEnd;
+			$replaceWith = $matches[1] . $matches[2] . $appendString . $commentEnd;
 
-            return $replaceWith;
-        };
+			return $replaceWith;
+		};
 
-        // If it's a simple case where there is no existing header, add the existing license.
-        if (1 === preg_match($noCommentBetweenPhpOpenAndFirstCodePattern, $phpString)) {
-            $modifiedComment = "/**\n * {$licenseDeclaration}\n *\n * {$modifiedDeclaration}\n * {$straussLink}\n */";
-            $updatedPhpString = preg_replace('~<\?php~', "<?php\n". $modifiedComment, $phpString, 1);
-        } else {
-            $updatedPhpString = preg_replace_callback(
-                $multilineCommentCapturePattern,
-                $replaceInMultilineCommentFunction,
-                $phpString,
-                1
-            );
-        }
+		// If it's a simple case where there is no existing header, add the existing license.
+		if (1 === preg_match($noCommentBetweenPhpOpenAndFirstCodePattern, $phpString)) {
+			$modifiedComment = "/**\n * {$licenseDeclaration}\n *\n * {$modifiedDeclaration}\n * {$straussLink}\n */";
+			$updatedPhpString = preg_replace('~<\?php~', "<?php\n". $modifiedComment, $phpString, 1);
+		} else {
+			$updatedPhpString = preg_replace_callback(
+				$multilineCommentCapturePattern,
+				$replaceInMultilineCommentFunction,
+				$phpString,
+				1
+			);
+		}
 
-        return $updatedPhpString;
-    }
+		return $updatedPhpString;
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -51,7 +51,7 @@ 
      * @param array $dependencies Whose folders are searched for existing license.txt files.
      * @param string $author To add to each modified file's header
      */
-    public function __construct(StraussConfig $config, string $workingDir, array $dependencies, string $author)
+    public function __construct( StraussConfig $config, string $workingDir, array $dependencies, string $author )
     {
         $this->workingDir = $workingDir;
         $this->dependencies = $dependencies;
@@ -59,25 +59,25 @@ 
 
         $this->targetDirectory = $config->getTargetDirectory();
 
-        $this->filesystem = new Filesystem(new Local($workingDir));
+        $this->filesystem = new Filesystem( new Local( $workingDir ) );
     }
 
     public function copyLicenses(): void
     {
         $this->findLicenseFiles();
 
-        foreach ($this->getDiscoveredLicenseFiles() as $licenseFile) {
+        foreach ( $this->getDiscoveredLicenseFiles() as $licenseFile ) {
             $targetLicenseFile = $this->targetDirectory . $licenseFile;
 
-            $targetLicenseFileDir = dirname($targetLicenseFile);
+            $targetLicenseFileDir = dirname( $targetLicenseFile );
 
             // Don't try copy it if it's already there.
-            if ($this->filesystem->has($targetLicenseFile)) {
+            if ( $this->filesystem->has( $targetLicenseFile ) ) {
                 continue;
             }
 
             // Don't add licenses to non-existent directories – there were no files copied there!
-            if (! $this->filesystem->has($targetLicenseFileDir)) {
+            if ( ! $this->filesystem->has( $targetLicenseFileDir ) ) {
                 continue;
             }
 
@@ -92,7 +92,7 @@ 
     /**
      * @see https://www.phpliveregex.com/p/A5y
      */
-    public function findLicenseFiles(?Finder $finder = null)
+    public function findLicenseFiles( ?Finder $finder = null )
     {
 
         // Include all license files in the dependency path.
@@ -102,54 +102,54 @@ 
         $prefixToRemove = 'vendor' . DIRECTORY_SEPARATOR;
 
         /** @var ComposerPackage $dependency */
-        foreach ($this->dependencies as $dependency) {
+        foreach ( $this->dependencies as $dependency ) {
             $packagePath = 'vendor' . DIRECTORY_SEPARATOR . $dependency->getPath();
 
             // If packages happen to have their vendor dir, i.e. locally required packages, don't included the licenses
             // from their vendor dir (they should be included otherwise anyway).
             // $dependency->getVendorDir()
-            $finder->files()->in($packagePath)->followLinks()->exclude(array( 'vendor' ))->name('/^.*licen.e.*/i');
+            $finder->files()->in( $packagePath )->followLinks()->exclude( array( 'vendor' ) )->name( '/^.*licen.e.*/i' );
 
             /** @var \SplFileInfo $foundFile */
-            foreach ($finder as $foundFile) {
+            foreach ( $finder as $foundFile ) {
                 $filePath = $foundFile->getPathname();
 
-                $relativeFilepath = str_replace($prefixToRemove, '', $filePath);
+                $relativeFilepath = str_replace( $prefixToRemove, '', $filePath );
 
                 // Replace multiple \ and/or / with OS native DIRECTORY_SEPARATOR.
-                $relativeFilepath = preg_replace('#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath);
+                $relativeFilepath = preg_replace( '#[\\\/]+#', DIRECTORY_SEPARATOR, $relativeFilepath );
 
-                $this->discoveredLicenseFiles[$relativeFilepath] = $dependency->getName();
+                $this->discoveredLicenseFiles[ $relativeFilepath ] = $dependency->getName();
             }
         }
     }
 
     public function getDiscoveredLicenseFiles(): array
     {
-        return array_keys($this->discoveredLicenseFiles);
+        return array_keys( $this->discoveredLicenseFiles );
     }
 
     /**
      * @param array<string, ComposerPackage> $modifiedFiles
      */
-    public function addInformationToUpdatedFiles(array $modifiedFiles)
+    public function addInformationToUpdatedFiles( array $modifiedFiles )
     {
 
         // e.g. "25-April-2021".
-        $date = gmdate("d-F-Y", time());
+        $date = gmdate( "d-F-Y", time() );
 
-        foreach ($modifiedFiles as $relativeFilePath => $package) {
+        foreach ( $modifiedFiles as $relativeFilePath => $package ) {
             $filepath = $this->targetDirectory . $relativeFilePath;
 
             $packageLicense = $package->getLicense();
 
             // Throws an exception, but unlikely to happen.
-            $contents = $this->filesystem->read($filepath);
+            $contents = $this->filesystem->read( $filepath );
 
-            $updatedContents = $this->addChangeDeclarationToPhpString($contents, $date, $packageLicense);
+            $updatedContents = $this->addChangeDeclarationToPhpString( $contents, $date, $packageLicense );
 
-            if ($updatedContents !== $contents) {
-                $this->filesystem->put($filepath, $updatedContents);
+            if ( $updatedContents !== $contents ) {
+                $this->filesystem->put( $filepath, $updatedContents );
             }
         }
     }
@@ -202,17 +202,17 @@ 
             ~Ux';                          // U: Non-greedy matching, x: ignore whitespace in pattern.
 
 
-        $replaceInMultilineCommentFunction = function ($matches) use (
+        $replaceInMultilineCommentFunction = function( $matches ) use (
             $licenseDeclaration,
             $modifiedDeclaration,
             $straussLink
         ) {
 
             // Find the line prefix and use it, i.e. could be none, asterisk or space-asterisk.
-            $commentLines = explode("\n", $matches[2]);
+            $commentLines = explode( "\n", $matches[ 2 ] );
 
-            if (isset($commentLines[1])&& 1 === preg_match('/^([\s\\\*]*)/', $commentLines[1], $output_array)) {
-                $lineStart = $output_array[1];
+            if ( isset( $commentLines[ 1 ] ) && 1 === preg_match( '/^([\s\\\*]*)/', $commentLines[ 1 ], $output_array ) ) {
+                $lineStart = $output_array[ 1 ];
             } else {
                 $lineStart = ' * ';
             }
@@ -220,24 +220,24 @@ 
             $appendString = "*\n";
 
             // If the license is not already specified in the header, add it.
-            if (false === strpos($matches[2], 'licen')) {
+            if ( false === strpos( $matches[ 2 ], 'licen' ) ) {
                 $appendString .= "{$lineStart}{$licenseDeclaration}\n";
             }
 
             $appendString .= "{$lineStart}{$modifiedDeclaration}\n";
             $appendString .= "{$lineStart}{$straussLink}\n";
 
-            $commentEnd =  rtrim(rtrim($lineStart, ' '), '*').'*/';
+            $commentEnd = rtrim( rtrim( $lineStart, ' ' ), '*' ) . '*/';
 
-            $replaceWith = $matches[1] . $matches[2] . $appendString . $commentEnd;
+            $replaceWith = $matches[ 1 ] . $matches[ 2 ] . $appendString . $commentEnd;
 
             return $replaceWith;
         };
 
         // If it's a simple case where there is no existing header, add the existing license.
-        if (1 === preg_match($noCommentBetweenPhpOpenAndFirstCodePattern, $phpString)) {
+        if ( 1 === preg_match( $noCommentBetweenPhpOpenAndFirstCodePattern, $phpString ) ) {
             $modifiedComment = "/**\n * {$licenseDeclaration}\n *\n * {$modifiedDeclaration}\n * {$straussLink}\n */";
-            $updatedPhpString = preg_replace('~<\?php~', "<?php\n". $modifiedComment, $phpString, 1);
+            $updatedPhpString = preg_replace( '~<\?php~', "<?php\n" . $modifiedComment, $phpString, 1 );
         } else {
             $updatedPhpString = preg_replace_callback(
                 $multilineCommentCapturePattern,

Braces +4 added lines, -8 removed lines

@@ -22,8 +22,7 @@ 
 use League\Flysystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 
-class Licenser
-{
+class Licenser {
 
     protected string $workingDir;
 
@@ -51,8 +50,7 @@ 
      * @param array $dependencies Whose folders are searched for existing license.txt files.
      * @param string $author To add to each modified file's header
      */
-    public function __construct(StraussConfig $config, string $workingDir, array $dependencies, string $author)
-    {
+    public function __construct(StraussConfig $config, string $workingDir, array $dependencies, string $author) {
         $this->workingDir = $workingDir;
         $this->dependencies = $dependencies;
         $this->author = $author;
@@ -92,8 +90,7 @@ 
     /**
      * @see https://www.phpliveregex.com/p/A5y
      */
-    public function findLicenseFiles(?Finder $finder = null)
-    {
+    public function findLicenseFiles(?Finder $finder = null) {
 
         // Include all license files in the dependency path.
         $finder = $finder ?? new Finder();
@@ -132,8 +129,7 @@ 
     /**
      * @param array<string, ComposerPackage> $modifiedFiles
      */
-    public function addInformationToUpdatedFiles(array $modifiedFiles)
-    {
+    public function addInformationToUpdatedFiles(array $modifiedFiles) {
 
         // e.g. "25-April-2021".
         $date = gmdate("d-F-Y", time());

vendor/brianhenryie/strauss/src/Prefixer.php

Indentation +225 added lines, -225 removed lines

@@ -11,118 +11,118 @@ 
 
 class Prefixer
 {
-    /** @var StraussConfig */
-    protected $config;
-
-    /** @var Filesystem */
-    protected $filesystem;
-
-    protected string $targetDirectory;
-    protected string $namespacePrefix;
-    protected string $classmapPrefix;
-
-    protected array $excludePackageNamesFromPrefixing;
-    protected array $excludeNamespacesFromPrefixing;
-    protected array $excludeFilePatternsFromPrefixing;
-
-    /** @var array<string, ComposerPackage> */
-    protected array $changedFiles = array();
-
-    public function __construct(StraussConfig $config, string $workingDir)
-    {
-        $this->filesystem = new Filesystem(new Local($workingDir));
-
-        $this->targetDirectory = $config->getTargetDirectory();
-        $this->namespacePrefix = $config->getNamespacePrefix();
-        $this->classmapPrefix = $config->getClassmapPrefix();
-
-        $this->excludePackageNamesFromPrefixing = $config->getExcludePackagesFromPrefixing();
-        $this->excludeNamespacesFromPrefixing = $config->getExcludeNamespacesFromPrefixing();
-        $this->excludeFilePatternsFromPrefixing = $config->getExcludeFilePatternsFromPrefixing();
-    }
-
-    // Don't replace a classname if there's an import for a class with the same name.
-    // but do replace \Classname always
-
-
-    /**
-     * @param array<string, string> $namespaceChanges
-     * @param array<string, string> $classChanges
-     * @param array<string, ComposerPackage> $phpFileList
-     * @throws FileNotFoundException
-     */
-    public function replaceInFiles(array $namespaceChanges, array $classChanges, array $phpFileList)
-    {
-
-        foreach ($phpFileList as $sourceRelativeFilePathFromVendor => $package) {
-            // Skip excluded namespaces.
-            if (in_array($package->getName(), $this->excludePackageNamesFromPrefixing)) {
-                continue;
-            }
-
-            // Skip files whose filepath matches an excluded pattern.
-            foreach ($this->excludeFilePatternsFromPrefixing as $excludePattern) {
-                if (1 === preg_match($excludePattern, $sourceRelativeFilePathFromVendor)) {
-                    continue 2;
-                }
-            }
-
-            $targetRelativeFilepathFromProject =
-                $this->targetDirectory. $sourceRelativeFilePathFromVendor;
-
-            // Throws an exception, but unlikely to happen.
-            $contents = $this->filesystem->read($targetRelativeFilepathFromProject);
-
-            $updatedContents = $this->replaceInString($namespaceChanges, $classChanges, $contents);
-
-            if ($updatedContents !== $contents) {
-                $this->changedFiles[$sourceRelativeFilePathFromVendor] = $package;
-                $this->filesystem->put($targetRelativeFilepathFromProject, $updatedContents);
-            }
-        }
-    }
-
-    public function replaceInString(array $namespacesChanges, array $classes, string $contents): string
-    {
-
-        foreach ($namespacesChanges as $originalNamespace => $replacement) {
-            if (in_array($originalNamespace, $this->excludeNamespacesFromPrefixing)) {
-                continue;
-            }
-
-            $contents = $this->replaceNamespace($contents, $originalNamespace, $replacement);
-        }
-
-        foreach ($classes as $originalClassname) {
-            $classmapPrefix = $this->classmapPrefix;
-
-            $contents = $this->replaceClassname($contents, $originalClassname, $classmapPrefix);
-        }
-
-        return $contents;
-    }
-
-    /**
-     * TODO: Test against traits.
-     *
-     * @param string $contents The text to make replacements in.
-     *
-     * @return string The updated text.
-     */
-    public function replaceNamespace($contents, $originalNamespace, $replacement)
-    {
-
-        // When namespaces exist inside strings...
-        $searchNamespace =
-            preg_quote($originalNamespace, '/')
-            . '|'
-            . preg_quote(str_replace('\\', '\\\\', $originalNamespace), '/')
-            . '|'
-            . preg_quote('\\' . $originalNamespace, '/')
-            . '|'
-            . preg_quote('\\\\' . str_replace('\\', '\\\\', $originalNamespace), '/');
-
-        $pattern = "
+	/** @var StraussConfig */
+	protected $config;
+
+	/** @var Filesystem */
+	protected $filesystem;
+
+	protected string $targetDirectory;
+	protected string $namespacePrefix;
+	protected string $classmapPrefix;
+
+	protected array $excludePackageNamesFromPrefixing;
+	protected array $excludeNamespacesFromPrefixing;
+	protected array $excludeFilePatternsFromPrefixing;
+
+	/** @var array<string, ComposerPackage> */
+	protected array $changedFiles = array();
+
+	public function __construct(StraussConfig $config, string $workingDir)
+	{
+		$this->filesystem = new Filesystem(new Local($workingDir));
+
+		$this->targetDirectory = $config->getTargetDirectory();
+		$this->namespacePrefix = $config->getNamespacePrefix();
+		$this->classmapPrefix = $config->getClassmapPrefix();
+
+		$this->excludePackageNamesFromPrefixing = $config->getExcludePackagesFromPrefixing();
+		$this->excludeNamespacesFromPrefixing = $config->getExcludeNamespacesFromPrefixing();
+		$this->excludeFilePatternsFromPrefixing = $config->getExcludeFilePatternsFromPrefixing();
+	}
+
+	// Don't replace a classname if there's an import for a class with the same name.
+	// but do replace \Classname always
+
+
+	/**
+	 * @param array<string, string> $namespaceChanges
+	 * @param array<string, string> $classChanges
+	 * @param array<string, ComposerPackage> $phpFileList
+	 * @throws FileNotFoundException
+	 */
+	public function replaceInFiles(array $namespaceChanges, array $classChanges, array $phpFileList)
+	{
+
+		foreach ($phpFileList as $sourceRelativeFilePathFromVendor => $package) {
+			// Skip excluded namespaces.
+			if (in_array($package->getName(), $this->excludePackageNamesFromPrefixing)) {
+				continue;
+			}
+
+			// Skip files whose filepath matches an excluded pattern.
+			foreach ($this->excludeFilePatternsFromPrefixing as $excludePattern) {
+				if (1 === preg_match($excludePattern, $sourceRelativeFilePathFromVendor)) {
+					continue 2;
+				}
+			}
+
+			$targetRelativeFilepathFromProject =
+				$this->targetDirectory. $sourceRelativeFilePathFromVendor;
+
+			// Throws an exception, but unlikely to happen.
+			$contents = $this->filesystem->read($targetRelativeFilepathFromProject);
+
+			$updatedContents = $this->replaceInString($namespaceChanges, $classChanges, $contents);
+
+			if ($updatedContents !== $contents) {
+				$this->changedFiles[$sourceRelativeFilePathFromVendor] = $package;
+				$this->filesystem->put($targetRelativeFilepathFromProject, $updatedContents);
+			}
+		}
+	}
+
+	public function replaceInString(array $namespacesChanges, array $classes, string $contents): string
+	{
+
+		foreach ($namespacesChanges as $originalNamespace => $replacement) {
+			if (in_array($originalNamespace, $this->excludeNamespacesFromPrefixing)) {
+				continue;
+			}
+
+			$contents = $this->replaceNamespace($contents, $originalNamespace, $replacement);
+		}
+
+		foreach ($classes as $originalClassname) {
+			$classmapPrefix = $this->classmapPrefix;
+
+			$contents = $this->replaceClassname($contents, $originalClassname, $classmapPrefix);
+		}
+
+		return $contents;
+	}
+
+	/**
+	 * TODO: Test against traits.
+	 *
+	 * @param string $contents The text to make replacements in.
+	 *
+	 * @return string The updated text.
+	 */
+	public function replaceNamespace($contents, $originalNamespace, $replacement)
+	{
+
+		// When namespaces exist inside strings...
+		$searchNamespace =
+			preg_quote($originalNamespace, '/')
+			. '|'
+			. preg_quote(str_replace('\\', '\\\\', $originalNamespace), '/')
+			. '|'
+			. preg_quote('\\' . $originalNamespace, '/')
+			. '|'
+			. preg_quote('\\\\' . str_replace('\\', '\\\\', $originalNamespace), '/');
+
+		$pattern = "
             /                              # Start the pattern
             (
             ^\s*                           # start of the line
@@ -156,62 +156,62 @@ 
             )                            
             /Ux";                          // U: Non-greedy matching, x: ignore whitespace in pattern.
 
-        $replacingFunction = function ($matches) use ($originalNamespace, $replacement) {
-
-            $singleBackslash = '\\\\';
-            $doubleBackslash = '\\\\\\\\';
-            $originalNamespacePattern = str_replace('\\', '\\\\+', $originalNamespace);
-            $beginsSingleBackslashPattern = "#{$singleBackslash}{$originalNamespacePattern}#";
-            $beginsDoubleBackslashPattern = "#{$doubleBackslash}{$originalNamespacePattern}#";
-            $containsDoubleBackslashPattern = "#{$doubleBackslash}#";
-
-            // Namespace begins with \\.
-            if (preg_match($beginsDoubleBackslashPattern, $matches[2])) {
-                $replacement = str_replace("\\", "\\\\", $replacement);
-                $replacement = "\\\\" . $replacement;
-            } elseif (preg_match($beginsSingleBackslashPattern, $matches[2])) {
-                $replacement = "\\" . $replacement;
-            } elseif (preg_match($containsDoubleBackslashPattern, $matches[2])) {
-                $replacement = str_replace("\\", "\\\\", $replacement);
-            }
-
-            return $matches[1] . $replacement . $matches[3];
-        };
-
-        $result = preg_replace_callback($pattern, $replacingFunction, $contents);
-
-        $matchingError = preg_last_error();
-        if (0 !== $matchingError) {
-            $message = "Matching error {$matchingError}";
-            if (PREG_BACKTRACK_LIMIT_ERROR === $matchingError) {
-                $message = 'Preg Backtrack limit was exhausted!';
-            }
-            throw new Exception($message);
-        }
-
-        return $result;
-    }
-
-    /**
-     * In a namespace:
-     * * use \Classname;
-     * * new \Classname()
-     *
-     * In a global namespace:
-     * * new Classname()
-     *
-     * @param string $contents
-     * @param string $originalClassname
-     * @param string $classnamePrefix
-     * @return array|string|string[]|null
-     * @throws \Exception
-     */
-    public function replaceClassname($contents, $originalClassname, $classnamePrefix)
-    {
-        $searchClassname = preg_quote($originalClassname, '/');
-
-        // This could be more specific if we could enumerate all preceeding and proceeding words ("new", "("...).
-        $pattern = '
+		$replacingFunction = function ($matches) use ($originalNamespace, $replacement) {
+
+			$singleBackslash = '\\\\';
+			$doubleBackslash = '\\\\\\\\';
+			$originalNamespacePattern = str_replace('\\', '\\\\+', $originalNamespace);
+			$beginsSingleBackslashPattern = "#{$singleBackslash}{$originalNamespacePattern}#";
+			$beginsDoubleBackslashPattern = "#{$doubleBackslash}{$originalNamespacePattern}#";
+			$containsDoubleBackslashPattern = "#{$doubleBackslash}#";
+
+			// Namespace begins with \\.
+			if (preg_match($beginsDoubleBackslashPattern, $matches[2])) {
+				$replacement = str_replace("\\", "\\\\", $replacement);
+				$replacement = "\\\\" . $replacement;
+			} elseif (preg_match($beginsSingleBackslashPattern, $matches[2])) {
+				$replacement = "\\" . $replacement;
+			} elseif (preg_match($containsDoubleBackslashPattern, $matches[2])) {
+				$replacement = str_replace("\\", "\\\\", $replacement);
+			}
+
+			return $matches[1] . $replacement . $matches[3];
+		};
+
+		$result = preg_replace_callback($pattern, $replacingFunction, $contents);
+
+		$matchingError = preg_last_error();
+		if (0 !== $matchingError) {
+			$message = "Matching error {$matchingError}";
+			if (PREG_BACKTRACK_LIMIT_ERROR === $matchingError) {
+				$message = 'Preg Backtrack limit was exhausted!';
+			}
+			throw new Exception($message);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * In a namespace:
+	 * * use \Classname;
+	 * * new \Classname()
+	 *
+	 * In a global namespace:
+	 * * new Classname()
+	 *
+	 * @param string $contents
+	 * @param string $originalClassname
+	 * @param string $classnamePrefix
+	 * @return array|string|string[]|null
+	 * @throws \Exception
+	 */
+	public function replaceClassname($contents, $originalClassname, $classnamePrefix)
+	{
+		$searchClassname = preg_quote($originalClassname, '/');
+
+		// This could be more specific if we could enumerate all preceeding and proceeding words ("new", "("...).
+		$pattern = '
 			/											# Start the pattern
 				namespace\s+([a-zA-Z0-9_\x7f-\xff\\\\]+).*?{.*?(namespace|\z) 
 														# Look for a preceeding namespace declaration, up until a 
@@ -222,65 +222,65 @@ 
 				
 			/x'; //                                     # x: ignore whitespace in regex.
 
-        $replacingFunction = function ($matches) use ($originalClassname, $classnamePrefix) {
-
-            // If we're inside a namespace other than the global namespace:
-            if (1 === preg_match('/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[0])) {
-                $updated = $this->replaceGlobalClassInsideNamedNamespace(
-                    $matches[0],
-                    $originalClassname,
-                    $classnamePrefix
-                );
-
-                return $updated;
-            }
-
-            return $matches[1] . $matches[2] . $matches[3] . $classnamePrefix . $originalClassname . $matches[5];
-        };
-
-        $result = preg_replace_callback($pattern, $replacingFunction, $contents);
-
-        $matchingError = preg_last_error();
-        if (0 !== $matchingError) {
-            $message = "Matching error {$matchingError}";
-            if (PREG_BACKTRACK_LIMIT_ERROR === $matchingError) {
-                $message = 'Backtrack limit was exhausted!';
-            }
-            throw new Exception($message);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Pass in a string and look for \Classname instances.
-     *
-     * @param string $contents
-     * @param string $originalClassname
-     * @param string $classnamePrefix
-     * @return string
-     */
-    protected function replaceGlobalClassInsideNamedNamespace($contents, $originalClassname, $classnamePrefix): string
-    {
-
-        return preg_replace_callback(
-            '/([^a-zA-Z0-9_\x7f-\xff]  # Not a class character
+		$replacingFunction = function ($matches) use ($originalClassname, $classnamePrefix) {
+
+			// If we're inside a namespace other than the global namespace:
+			if (1 === preg_match('/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[0])) {
+				$updated = $this->replaceGlobalClassInsideNamedNamespace(
+					$matches[0],
+					$originalClassname,
+					$classnamePrefix
+				);
+
+				return $updated;
+			}
+
+			return $matches[1] . $matches[2] . $matches[3] . $classnamePrefix . $originalClassname . $matches[5];
+		};
+
+		$result = preg_replace_callback($pattern, $replacingFunction, $contents);
+
+		$matchingError = preg_last_error();
+		if (0 !== $matchingError) {
+			$message = "Matching error {$matchingError}";
+			if (PREG_BACKTRACK_LIMIT_ERROR === $matchingError) {
+				$message = 'Backtrack limit was exhausted!';
+			}
+			throw new Exception($message);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Pass in a string and look for \Classname instances.
+	 *
+	 * @param string $contents
+	 * @param string $originalClassname
+	 * @param string $classnamePrefix
+	 * @return string
+	 */
+	protected function replaceGlobalClassInsideNamedNamespace($contents, $originalClassname, $classnamePrefix): string
+	{
+
+		return preg_replace_callback(
+			'/([^a-zA-Z0-9_\x7f-\xff]  # Not a class character
 			\\\)                       # Followed by a backslash to indicate global namespace
 			('.$originalClassname.')   # Followed by the classname
 			([^\\\;]+)                 # Not a backslash or semicolon which might indicate a namespace
 			/x', //                    # x: ignore whitespace in regex.
-            function ($matches) use ($originalClassname, $classnamePrefix) {
-                return $matches[1] . $classnamePrefix . $originalClassname . $matches[3];
-            },
-            $contents
-        );
-    }
-
-    /**
-     * @return array<string, ComposerPackage>
-     */
-    public function getModifiedFiles(): array
-    {
-        return $this->changedFiles;
-    }
+			function ($matches) use ($originalClassname, $classnamePrefix) {
+				return $matches[1] . $classnamePrefix . $originalClassname . $matches[3];
+			},
+			$contents
+		);
+	}
+
+	/**
+	 * @return array<string, ComposerPackage>
+	 */
+	public function getModifiedFiles(): array
+	{
+		return $this->changedFiles;
+	}
 }

Spacing +51 added lines, -51 removed lines

@@ -28,9 +28,9 @@ 
     /** @var array<string, ComposerPackage> */
     protected array $changedFiles = array();
 
-    public function __construct(StraussConfig $config, string $workingDir)
+    public function __construct( StraussConfig $config, string $workingDir )
     {
-        $this->filesystem = new Filesystem(new Local($workingDir));
+        $this->filesystem = new Filesystem( new Local( $workingDir ) );
 
         $this->targetDirectory = $config->getTargetDirectory();
         $this->namespacePrefix = $config->getNamespacePrefix();
@@ -51,52 +51,52 @@ 
      * @param array<string, ComposerPackage> $phpFileList
      * @throws FileNotFoundException
      */
-    public function replaceInFiles(array $namespaceChanges, array $classChanges, array $phpFileList)
+    public function replaceInFiles( array $namespaceChanges, array $classChanges, array $phpFileList )
     {
 
-        foreach ($phpFileList as $sourceRelativeFilePathFromVendor => $package) {
+        foreach ( $phpFileList as $sourceRelativeFilePathFromVendor => $package ) {
             // Skip excluded namespaces.
-            if (in_array($package->getName(), $this->excludePackageNamesFromPrefixing)) {
+            if ( in_array( $package->getName(), $this->excludePackageNamesFromPrefixing ) ) {
                 continue;
             }
 
             // Skip files whose filepath matches an excluded pattern.
-            foreach ($this->excludeFilePatternsFromPrefixing as $excludePattern) {
-                if (1 === preg_match($excludePattern, $sourceRelativeFilePathFromVendor)) {
+            foreach ( $this->excludeFilePatternsFromPrefixing as $excludePattern ) {
+                if ( 1 === preg_match( $excludePattern, $sourceRelativeFilePathFromVendor ) ) {
                     continue 2;
                 }
             }
 
             $targetRelativeFilepathFromProject =
-                $this->targetDirectory. $sourceRelativeFilePathFromVendor;
+                $this->targetDirectory . $sourceRelativeFilePathFromVendor;
 
             // Throws an exception, but unlikely to happen.
-            $contents = $this->filesystem->read($targetRelativeFilepathFromProject);
+            $contents = $this->filesystem->read( $targetRelativeFilepathFromProject );
 
-            $updatedContents = $this->replaceInString($namespaceChanges, $classChanges, $contents);
+            $updatedContents = $this->replaceInString( $namespaceChanges, $classChanges, $contents );
 
-            if ($updatedContents !== $contents) {
-                $this->changedFiles[$sourceRelativeFilePathFromVendor] = $package;
-                $this->filesystem->put($targetRelativeFilepathFromProject, $updatedContents);
+            if ( $updatedContents !== $contents ) {
+                $this->changedFiles[ $sourceRelativeFilePathFromVendor ] = $package;
+                $this->filesystem->put( $targetRelativeFilepathFromProject, $updatedContents );
             }
         }
     }
 
-    public function replaceInString(array $namespacesChanges, array $classes, string $contents): string
+    public function replaceInString( array $namespacesChanges, array $classes, string $contents ): string
     {
 
-        foreach ($namespacesChanges as $originalNamespace => $replacement) {
-            if (in_array($originalNamespace, $this->excludeNamespacesFromPrefixing)) {
+        foreach ( $namespacesChanges as $originalNamespace => $replacement ) {
+            if ( in_array( $originalNamespace, $this->excludeNamespacesFromPrefixing ) ) {
                 continue;
             }
 
-            $contents = $this->replaceNamespace($contents, $originalNamespace, $replacement);
+            $contents = $this->replaceNamespace( $contents, $originalNamespace, $replacement );
         }
 
-        foreach ($classes as $originalClassname) {
+        foreach ( $classes as $originalClassname ) {
             $classmapPrefix = $this->classmapPrefix;
 
-            $contents = $this->replaceClassname($contents, $originalClassname, $classmapPrefix);
+            $contents = $this->replaceClassname( $contents, $originalClassname, $classmapPrefix );
         }
 
         return $contents;
@@ -109,18 +109,18 @@ 
      *
      * @return string The updated text.
      */
-    public function replaceNamespace($contents, $originalNamespace, $replacement)
+    public function replaceNamespace( $contents, $originalNamespace, $replacement )
     {
 
         // When namespaces exist inside strings...
         $searchNamespace =
-            preg_quote($originalNamespace, '/')
+            preg_quote( $originalNamespace, '/' )
             . '|'
-            . preg_quote(str_replace('\\', '\\\\', $originalNamespace), '/')
+            . preg_quote( str_replace( '\\', '\\\\', $originalNamespace ), '/' )
             . '|'
-            . preg_quote('\\' . $originalNamespace, '/')
+            . preg_quote( '\\' . $originalNamespace, '/' )
             . '|'
-            . preg_quote('\\\\' . str_replace('\\', '\\\\', $originalNamespace), '/');
+            . preg_quote( '\\\\' . str_replace( '\\', '\\\\', $originalNamespace ), '/' );
 
         $pattern = "
             /                              # Start the pattern
@@ -154,39 +154,39 @@ 
             |'                             # or single quote         
             |:                             # or a colon to access a static
             )                            
-            /Ux";                          // U: Non-greedy matching, x: ignore whitespace in pattern.
+            /Ux"; // U: Non-greedy matching, x: ignore whitespace in pattern.
 
-        $replacingFunction = function ($matches) use ($originalNamespace, $replacement) {
+        $replacingFunction = function( $matches ) use ( $originalNamespace, $replacement ) {
 
             $singleBackslash = '\\\\';
             $doubleBackslash = '\\\\\\\\';
-            $originalNamespacePattern = str_replace('\\', '\\\\+', $originalNamespace);
+            $originalNamespacePattern = str_replace( '\\', '\\\\+', $originalNamespace );
             $beginsSingleBackslashPattern = "#{$singleBackslash}{$originalNamespacePattern}#";
             $beginsDoubleBackslashPattern = "#{$doubleBackslash}{$originalNamespacePattern}#";
             $containsDoubleBackslashPattern = "#{$doubleBackslash}#";
 
             // Namespace begins with \\.
-            if (preg_match($beginsDoubleBackslashPattern, $matches[2])) {
-                $replacement = str_replace("\\", "\\\\", $replacement);
+            if ( preg_match( $beginsDoubleBackslashPattern, $matches[ 2 ] ) ) {
+                $replacement = str_replace( "\\", "\\\\", $replacement );
                 $replacement = "\\\\" . $replacement;
-            } elseif (preg_match($beginsSingleBackslashPattern, $matches[2])) {
+            } elseif ( preg_match( $beginsSingleBackslashPattern, $matches[ 2 ] ) ) {
                 $replacement = "\\" . $replacement;
-            } elseif (preg_match($containsDoubleBackslashPattern, $matches[2])) {
-                $replacement = str_replace("\\", "\\\\", $replacement);
+            } elseif ( preg_match( $containsDoubleBackslashPattern, $matches[ 2 ] ) ) {
+                $replacement = str_replace( "\\", "\\\\", $replacement );
             }
 
-            return $matches[1] . $replacement . $matches[3];
+            return $matches[ 1 ] . $replacement . $matches[ 3 ];
         };
 
-        $result = preg_replace_callback($pattern, $replacingFunction, $contents);
+        $result = preg_replace_callback( $pattern, $replacingFunction, $contents );
 
         $matchingError = preg_last_error();
-        if (0 !== $matchingError) {
+        if ( 0 !== $matchingError ) {
             $message = "Matching error {$matchingError}";
-            if (PREG_BACKTRACK_LIMIT_ERROR === $matchingError) {
+            if ( PREG_BACKTRACK_LIMIT_ERROR === $matchingError ) {
                 $message = 'Preg Backtrack limit was exhausted!';
             }
-            throw new Exception($message);
+            throw new Exception( $message );
         }
 
         return $result;
@@ -206,9 +206,9 @@ 
      * @return array|string|string[]|null
      * @throws \Exception
      */
-    public function replaceClassname($contents, $originalClassname, $classnamePrefix)
+    public function replaceClassname( $contents, $originalClassname, $classnamePrefix )
     {
-        $searchClassname = preg_quote($originalClassname, '/');
+        $searchClassname = preg_quote( $originalClassname, '/' );
 
         // This could be more specific if we could enumerate all preceeding and proceeding words ("new", "("...).
         $pattern = '
@@ -222,12 +222,12 @@ 
 				
 			/x'; //                                     # x: ignore whitespace in regex.
 
-        $replacingFunction = function ($matches) use ($originalClassname, $classnamePrefix) {
+        $replacingFunction = function( $matches ) use ( $originalClassname, $classnamePrefix ) {
 
             // If we're inside a namespace other than the global namespace:
-            if (1 === preg_match('/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[0])) {
+            if ( 1 === preg_match( '/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[ 0 ] ) ) {
                 $updated = $this->replaceGlobalClassInsideNamedNamespace(
-                    $matches[0],
+                    $matches[ 0 ],
                     $originalClassname,
                     $classnamePrefix
                 );
@@ -235,18 +235,18 @@ 
                 return $updated;
             }
 
-            return $matches[1] . $matches[2] . $matches[3] . $classnamePrefix . $originalClassname . $matches[5];
+            return $matches[ 1 ] . $matches[ 2 ] . $matches[ 3 ] . $classnamePrefix . $originalClassname . $matches[ 5 ];
         };
 
-        $result = preg_replace_callback($pattern, $replacingFunction, $contents);
+        $result = preg_replace_callback( $pattern, $replacingFunction, $contents );
 
         $matchingError = preg_last_error();
-        if (0 !== $matchingError) {
+        if ( 0 !== $matchingError ) {
             $message = "Matching error {$matchingError}";
-            if (PREG_BACKTRACK_LIMIT_ERROR === $matchingError) {
+            if ( PREG_BACKTRACK_LIMIT_ERROR === $matchingError ) {
                 $message = 'Backtrack limit was exhausted!';
             }
-            throw new Exception($message);
+            throw new Exception( $message );
         }
 
         return $result;
@@ -260,17 +260,17 @@ 
      * @param string $classnamePrefix
      * @return string
      */
-    protected function replaceGlobalClassInsideNamedNamespace($contents, $originalClassname, $classnamePrefix): string
+    protected function replaceGlobalClassInsideNamedNamespace( $contents, $originalClassname, $classnamePrefix ): string
     {
 
         return preg_replace_callback(
             '/([^a-zA-Z0-9_\x7f-\xff]  # Not a class character
 			\\\)                       # Followed by a backslash to indicate global namespace
-			('.$originalClassname.')   # Followed by the classname
+			('.$originalClassname . ')   # Followed by the classname
 			([^\\\;]+)                 # Not a backslash or semicolon which might indicate a namespace
 			/x', //                    # x: ignore whitespace in regex.
-            function ($matches) use ($originalClassname, $classnamePrefix) {
-                return $matches[1] . $classnamePrefix . $originalClassname . $matches[3];
+            function( $matches ) use ( $originalClassname, $classnamePrefix ) {
+                return $matches[ 1 ] . $classnamePrefix . $originalClassname . $matches[ 3 ];
             },
             $contents
         );

Braces +5 added lines, -10 removed lines

@@ -9,8 +9,7 @@ 
 use League\Flysystem\FileNotFoundException;
 use League\Flysystem\Filesystem;
 
-class Prefixer
-{
+class Prefixer {
     /** @var StraussConfig */
     protected $config;
 
@@ -28,8 +27,7 @@ 
     /** @var array<string, ComposerPackage> */
     protected array $changedFiles = array();
 
-    public function __construct(StraussConfig $config, string $workingDir)
-    {
+    public function __construct(StraussConfig $config, string $workingDir) {
         $this->filesystem = new Filesystem(new Local($workingDir));
 
         $this->targetDirectory = $config->getTargetDirectory();
@@ -51,8 +49,7 @@ 
      * @param array<string, ComposerPackage> $phpFileList
      * @throws FileNotFoundException
      */
-    public function replaceInFiles(array $namespaceChanges, array $classChanges, array $phpFileList)
-    {
+    public function replaceInFiles(array $namespaceChanges, array $classChanges, array $phpFileList) {
 
         foreach ($phpFileList as $sourceRelativeFilePathFromVendor => $package) {
             // Skip excluded namespaces.
@@ -109,8 +106,7 @@ 
      *
      * @return string The updated text.
      */
-    public function replaceNamespace($contents, $originalNamespace, $replacement)
-    {
+    public function replaceNamespace($contents, $originalNamespace, $replacement) {
 
         // When namespaces exist inside strings...
         $searchNamespace =
@@ -206,8 +202,7 @@ 
      * @return array|string|string[]|null
      * @throws \Exception
      */
-    public function replaceClassname($contents, $originalClassname, $classnamePrefix)
-    {
+    public function replaceClassname($contents, $originalClassname, $classnamePrefix) {
         $searchClassname = preg_quote($originalClassname, '/');
 
         // This could be more specific if we could enumerate all preceeding and proceeding words ("new", "("...).

vendor/brianhenryie/strauss/src/ChangeEnumerator.php

Indentation +155 added lines, -155 removed lines

@@ -13,128 +13,128 @@ 
 class ChangeEnumerator
 {
 
-    protected string $namespacePrefix;
-    protected string $classmapPrefix;
-    /**
-     *
-     * @var string[]
-     */
-    protected array $excludePackagesFromPrefixing = array();
-    protected array $excludeNamespacesFromPrefixing = array();
-
-    protected array $excludeFilePatternsFromPrefixing = array();
-
-    protected array $namespaceReplacementPatterns = array();
-
-    /** @var string[] */
-    protected array $discoveredNamespaces = [];
-
-    /** @var string[] */
-    protected array $discoveredClasses = [];
-
-
-    /**
-     * ChangeEnumerator constructor.
-     * @param \BrianHenryIE\Strauss\Composer\Extra\StraussConfig $config
-     */
-    public function __construct(StraussConfig $config)
-    {
-        $this->namespacePrefix = $config->getNamespacePrefix();
-        $this->classmapPrefix = $config->getClassmapPrefix();
-
-        $this->excludePackagesFromPrefixing = $config->getExcludePackagesFromPrefixing();
-        $this->excludeNamespacesFromPrefixing = $config->getExcludeNamespacesFromPrefixing();
-        $this->excludeFilePatternsFromPrefixing = $config->getExcludeFilePatternsFromPrefixing();
-
-        $this->namespaceReplacementPatterns = $config->getNamespaceReplacementPatterns();
-    }
-
-    /**
-     * TODO: Order by longest string first. (or instead, record classnames with their namespaces)
-     *
-     * @return string[]
-     */
-    public function getDiscoveredNamespaceReplacements(): array
-    {
-        $discoveredNamespaceReplacements = $this->discoveredNamespaces;
-
-        uksort($discoveredNamespaceReplacements, function ($a, $b) {
-            return strlen($b) <=> strlen($a);
-        });
-
-        return $discoveredNamespaceReplacements;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getDiscoveredClasses(): array
-    {
-        return array_keys($this->discoveredClasses);
-    }
-
-
-    /**
-     * @param string $dir
-     * @param array<string, ComposerPackage> $relativeFilepaths
-     */
-    public function findInFiles($dir, $relativeFilepaths)
-    {
-
-        foreach ($relativeFilepaths as $relativeFilepath => $package) {
-            foreach ($this->excludePackagesFromPrefixing as $excludePackagesName) {
-                if ($package->getName() === $excludePackagesName) {
-                    continue 2;
-                }
-            }
-
-            foreach ($this->excludeFilePatternsFromPrefixing as $excludeFilePattern) {
-                if (1 === preg_match($excludeFilePattern, $relativeFilepath)) {
-                    continue 2;
-                }
-            }
-
-
-            $filepath = $dir . $relativeFilepath;
-
-            // TODO: use flysystem
-            // $contents = $this->filesystem->read($targetFile);
-
-            $contents = file_get_contents($filepath);
-
-            $this->find($contents);
-        }
-    }
-
-
-    /**
-     * TODO: Don't use preg_replace_callback!
-     *
-     * @param string $contents
-     *
-     * @return string $contents
-     */
-    public function find(string $contents): string
-    {
-
-        // If the entire file is under one namespace, all we want is the namespace.
-        $singleNamespacePattern = '/
+	protected string $namespacePrefix;
+	protected string $classmapPrefix;
+	/**
+	 *
+	 * @var string[]
+	 */
+	protected array $excludePackagesFromPrefixing = array();
+	protected array $excludeNamespacesFromPrefixing = array();
+
+	protected array $excludeFilePatternsFromPrefixing = array();
+
+	protected array $namespaceReplacementPatterns = array();
+
+	/** @var string[] */
+	protected array $discoveredNamespaces = [];
+
+	/** @var string[] */
+	protected array $discoveredClasses = [];
+
+
+	/**
+	 * ChangeEnumerator constructor.
+	 * @param \BrianHenryIE\Strauss\Composer\Extra\StraussConfig $config
+	 */
+	public function __construct(StraussConfig $config)
+	{
+		$this->namespacePrefix = $config->getNamespacePrefix();
+		$this->classmapPrefix = $config->getClassmapPrefix();
+
+		$this->excludePackagesFromPrefixing = $config->getExcludePackagesFromPrefixing();
+		$this->excludeNamespacesFromPrefixing = $config->getExcludeNamespacesFromPrefixing();
+		$this->excludeFilePatternsFromPrefixing = $config->getExcludeFilePatternsFromPrefixing();
+
+		$this->namespaceReplacementPatterns = $config->getNamespaceReplacementPatterns();
+	}
+
+	/**
+	 * TODO: Order by longest string first. (or instead, record classnames with their namespaces)
+	 *
+	 * @return string[]
+	 */
+	public function getDiscoveredNamespaceReplacements(): array
+	{
+		$discoveredNamespaceReplacements = $this->discoveredNamespaces;
+
+		uksort($discoveredNamespaceReplacements, function ($a, $b) {
+			return strlen($b) <=> strlen($a);
+		});
+
+		return $discoveredNamespaceReplacements;
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public function getDiscoveredClasses(): array
+	{
+		return array_keys($this->discoveredClasses);
+	}
+
+
+	/**
+	 * @param string $dir
+	 * @param array<string, ComposerPackage> $relativeFilepaths
+	 */
+	public function findInFiles($dir, $relativeFilepaths)
+	{
+
+		foreach ($relativeFilepaths as $relativeFilepath => $package) {
+			foreach ($this->excludePackagesFromPrefixing as $excludePackagesName) {
+				if ($package->getName() === $excludePackagesName) {
+					continue 2;
+				}
+			}
+
+			foreach ($this->excludeFilePatternsFromPrefixing as $excludeFilePattern) {
+				if (1 === preg_match($excludeFilePattern, $relativeFilepath)) {
+					continue 2;
+				}
+			}
+
+
+			$filepath = $dir . $relativeFilepath;
+
+			// TODO: use flysystem
+			// $contents = $this->filesystem->read($targetFile);
+
+			$contents = file_get_contents($filepath);
+
+			$this->find($contents);
+		}
+	}
+
+
+	/**
+	 * TODO: Don't use preg_replace_callback!
+	 *
+	 * @param string $contents
+	 *
+	 * @return string $contents
+	 */
+	public function find(string $contents): string
+	{
+
+		// If the entire file is under one namespace, all we want is the namespace.
+		$singleNamespacePattern = '/
             namespace\s+([0-9A-Za-z_\x7f-\xff\\\\]+)[\s\S]*;    # A single namespace in the file.... should return
         /x';
-        if (1 === preg_match($singleNamespacePattern, $contents, $matches)) {
-            $this->addDiscoveredNamespaceChange($matches[1]);
-            return $contents;
-        }
+		if (1 === preg_match($singleNamespacePattern, $contents, $matches)) {
+			$this->addDiscoveredNamespaceChange($matches[1]);
+			return $contents;
+		}
 
 
-        // TODO traits
+		// TODO traits
 
-        // TODO: Is the ";" in this still correct since it's being taken care of in the regex just above?
-        // Looks like with the preceeding regex, it will never match.
+		// TODO: Is the ";" in this still correct since it's being taken care of in the regex just above?
+		// Looks like with the preceeding regex, it will never match.
 
 
-        return preg_replace_callback(
-            '
+		return preg_replace_callback(
+			'
 			~											# Start the pattern
 				namespace\s+([a-zA-Z0-9_\x7f-\xff\\\\]+)[;{\s\n]{1}[\s\S]*?(?=namespace|$) 
 														# Look for a preceeding namespace declaration, 
@@ -152,44 +152,44 @@ 
 				(?:{|extends|implements|\n|$)			# Class declaration can be followed by {, extends, implements 
 														# or a new line
 			~x', //                                     # x: ignore whitespace in regex.
-            function ($matches) {
-
-                // If we're inside a namespace other than the global namespace:
-                if (1 === preg_match('/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[0])) {
-                    $this->addDiscoveredNamespaceChange($matches[1]);
-                    return $matches[0];
-                }
-
-                if (count($matches) < 3) {
-                    return $matches[0];
-                }
-
-                // TODO: Why is this [2] and not [1] (which seems to be always empty).
-                $this->discoveredClasses[$matches[2]] = $matches[2];
-                return $matches[0];
-            },
-            $contents
-        );
-    }
-
-    protected function addDiscoveredNamespaceChange(string $namespace)
-    {
-
-        foreach ($this->excludeNamespacesFromPrefixing as $excludeNamespace) {
-            if (0 === strpos($namespace, $excludeNamespace)) {
-                return;
-            }
-        }
-
-        foreach ($this->namespaceReplacementPatterns as $namespaceReplacementPattern => $replacement) {
-            $prefixed = preg_replace($namespaceReplacementPattern, $replacement, $namespace);
-
-            if ($prefixed !== $namespace) {
-                $this->discoveredNamespaces[$namespace] = $prefixed;
-                return;
-            }
-        }
-
-        $this->discoveredNamespaces[$namespace] = $this->namespacePrefix . '\\'. $namespace;
-    }
+			function ($matches) {
+
+				// If we're inside a namespace other than the global namespace:
+				if (1 === preg_match('/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[0])) {
+					$this->addDiscoveredNamespaceChange($matches[1]);
+					return $matches[0];
+				}
+
+				if (count($matches) < 3) {
+					return $matches[0];
+				}
+
+				// TODO: Why is this [2] and not [1] (which seems to be always empty).
+				$this->discoveredClasses[$matches[2]] = $matches[2];
+				return $matches[0];
+			},
+			$contents
+		);
+	}
+
+	protected function addDiscoveredNamespaceChange(string $namespace)
+	{
+
+		foreach ($this->excludeNamespacesFromPrefixing as $excludeNamespace) {
+			if (0 === strpos($namespace, $excludeNamespace)) {
+				return;
+			}
+		}
+
+		foreach ($this->namespaceReplacementPatterns as $namespaceReplacementPattern => $replacement) {
+			$prefixed = preg_replace($namespaceReplacementPattern, $replacement, $namespace);
+
+			if ($prefixed !== $namespace) {
+				$this->discoveredNamespaces[$namespace] = $prefixed;
+				return;
+			}
+		}
+
+		$this->discoveredNamespaces[$namespace] = $this->namespacePrefix . '\\'. $namespace;
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -27,17 +27,17 @@ 
     protected array $namespaceReplacementPatterns = array();
 
     /** @var string[] */
-    protected array $discoveredNamespaces = [];
+    protected array $discoveredNamespaces = [ ];
 
     /** @var string[] */
-    protected array $discoveredClasses = [];
+    protected array $discoveredClasses = [ ];
 
 
     /**
      * ChangeEnumerator constructor.
      * @param \BrianHenryIE\Strauss\Composer\Extra\StraussConfig $config
      */
-    public function __construct(StraussConfig $config)
+    public function __construct( StraussConfig $config )
     {
         $this->namespacePrefix = $config->getNamespacePrefix();
         $this->classmapPrefix = $config->getClassmapPrefix();
@@ -58,8 +58,8 @@ 
     {
         $discoveredNamespaceReplacements = $this->discoveredNamespaces;
 
-        uksort($discoveredNamespaceReplacements, function ($a, $b) {
-            return strlen($b) <=> strlen($a);
+        uksort( $discoveredNamespaceReplacements, function( $a, $b ) {
+            return strlen( $b ) <=> strlen( $a );
         });
 
         return $discoveredNamespaceReplacements;
@@ -70,7 +70,7 @@ 
      */
     public function getDiscoveredClasses(): array
     {
-        return array_keys($this->discoveredClasses);
+        return array_keys( $this->discoveredClasses );
     }
 
 
@@ -78,18 +78,18 @@ 
      * @param string $dir
      * @param array<string, ComposerPackage> $relativeFilepaths
      */
-    public function findInFiles($dir, $relativeFilepaths)
+    public function findInFiles( $dir, $relativeFilepaths )
     {
 
-        foreach ($relativeFilepaths as $relativeFilepath => $package) {
-            foreach ($this->excludePackagesFromPrefixing as $excludePackagesName) {
-                if ($package->getName() === $excludePackagesName) {
+        foreach ( $relativeFilepaths as $relativeFilepath => $package ) {
+            foreach ( $this->excludePackagesFromPrefixing as $excludePackagesName ) {
+                if ( $package->getName() === $excludePackagesName ) {
                     continue 2;
                 }
             }
 
-            foreach ($this->excludeFilePatternsFromPrefixing as $excludeFilePattern) {
-                if (1 === preg_match($excludeFilePattern, $relativeFilepath)) {
+            foreach ( $this->excludeFilePatternsFromPrefixing as $excludeFilePattern ) {
+                if ( 1 === preg_match( $excludeFilePattern, $relativeFilepath ) ) {
                     continue 2;
                 }
             }
@@ -100,9 +100,9 @@ 
             // TODO: use flysystem
             // $contents = $this->filesystem->read($targetFile);
 
-            $contents = file_get_contents($filepath);
+            $contents = file_get_contents( $filepath );
 
-            $this->find($contents);
+            $this->find( $contents );
         }
     }
 
@@ -114,15 +114,15 @@ 
      *
      * @return string $contents
      */
-    public function find(string $contents): string
+    public function find( string $contents ): string
     {
 
         // If the entire file is under one namespace, all we want is the namespace.
         $singleNamespacePattern = '/
             namespace\s+([0-9A-Za-z_\x7f-\xff\\\\]+)[\s\S]*;    # A single namespace in the file.... should return
         /x';
-        if (1 === preg_match($singleNamespacePattern, $contents, $matches)) {
-            $this->addDiscoveredNamespaceChange($matches[1]);
+        if ( 1 === preg_match( $singleNamespacePattern, $contents, $matches ) ) {
+            $this->addDiscoveredNamespaceChange( $matches[ 1 ] );
             return $contents;
         }
 
@@ -152,44 +152,44 @@ 
 				(?:{|extends|implements|\n|$)			# Class declaration can be followed by {, extends, implements 
 														# or a new line
 			~x', //                                     # x: ignore whitespace in regex.
-            function ($matches) {
+            function( $matches ) {
 
                 // If we're inside a namespace other than the global namespace:
-                if (1 === preg_match('/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[0])) {
-                    $this->addDiscoveredNamespaceChange($matches[1]);
-                    return $matches[0];
+                if ( 1 === preg_match( '/^namespace\s+[a-zA-Z0-9_\x7f-\xff\\\\]+[;{\s\n]{1}.*/', $matches[ 0 ] ) ) {
+                    $this->addDiscoveredNamespaceChange( $matches[ 1 ] );
+                    return $matches[ 0 ];
                 }
 
-                if (count($matches) < 3) {
-                    return $matches[0];
+                if ( count( $matches ) < 3 ) {
+                    return $matches[ 0 ];
                 }
 
                 // TODO: Why is this [2] and not [1] (which seems to be always empty).
-                $this->discoveredClasses[$matches[2]] = $matches[2];
-                return $matches[0];
+                $this->discoveredClasses[ $matches[ 2 ] ] = $matches[ 2 ];
+                return $matches[ 0 ];
             },
             $contents
         );
     }
 
-    protected function addDiscoveredNamespaceChange(string $namespace)
+    protected function addDiscoveredNamespaceChange( string $namespace )
     {
 
-        foreach ($this->excludeNamespacesFromPrefixing as $excludeNamespace) {
-            if (0 === strpos($namespace, $excludeNamespace)) {
+        foreach ( $this->excludeNamespacesFromPrefixing as $excludeNamespace ) {
+            if ( 0 === strpos( $namespace, $excludeNamespace ) ) {
                 return;
             }
         }
 
-        foreach ($this->namespaceReplacementPatterns as $namespaceReplacementPattern => $replacement) {
-            $prefixed = preg_replace($namespaceReplacementPattern, $replacement, $namespace);
+        foreach ( $this->namespaceReplacementPatterns as $namespaceReplacementPattern => $replacement ) {
+            $prefixed = preg_replace( $namespaceReplacementPattern, $replacement, $namespace );
 
-            if ($prefixed !== $namespace) {
-                $this->discoveredNamespaces[$namespace] = $prefixed;
+            if ( $prefixed !== $namespace ) {
+                $this->discoveredNamespaces[ $namespace ] = $prefixed;
                 return;
             }
         }
 
-        $this->discoveredNamespaces[$namespace] = $this->namespacePrefix . '\\'. $namespace;
+        $this->discoveredNamespaces[ $namespace ] = $this->namespacePrefix . '\\' . $namespace;
     }
 }

Braces +4 added lines, -8 removed lines

@@ -10,8 +10,7 @@ 
 use BrianHenryIE\Strauss\Composer\ComposerPackage;
 use BrianHenryIE\Strauss\Composer\Extra\StraussConfig;
 
-class ChangeEnumerator
-{
+class ChangeEnumerator {
 
     protected string $namespacePrefix;
     protected string $classmapPrefix;
@@ -37,8 +36,7 @@ 
      * ChangeEnumerator constructor.
      * @param \BrianHenryIE\Strauss\Composer\Extra\StraussConfig $config
      */
-    public function __construct(StraussConfig $config)
-    {
+    public function __construct(StraussConfig $config) {
         $this->namespacePrefix = $config->getNamespacePrefix();
         $this->classmapPrefix = $config->getClassmapPrefix();
 
@@ -78,8 +76,7 @@ 
      * @param string $dir
      * @param array<string, ComposerPackage> $relativeFilepaths
      */
-    public function findInFiles($dir, $relativeFilepaths)
-    {
+    public function findInFiles($dir, $relativeFilepaths) {
 
         foreach ($relativeFilepaths as $relativeFilepath => $package) {
             foreach ($this->excludePackagesFromPrefixing as $excludePackagesName) {
@@ -172,8 +169,7 @@ 
         );
     }
 
-    protected function addDiscoveredNamespaceChange(string $namespace)
-    {
+    protected function addDiscoveredNamespaceChange(string $namespace) {
 
         foreach ($this->excludeNamespacesFromPrefixing as $excludeNamespace) {
             if (0 === strpos($namespace, $excludeNamespace)) {

vendor/brianhenryie/strauss/src/Console/Commands/Compose.php

Indentation +200 added lines, -200 removed lines

@@ -19,259 +19,259 @@
 
 class Compose extends Command
 {
-    /** @var string */
-    protected string $workingDir;
+	/** @var string */
+	protected string $workingDir;
 
-    /** @var StraussConfig */
-    protected StraussConfig $config;
+	/** @var StraussConfig */
+	protected StraussConfig $config;
 
-    protected ProjectComposerPackage $projectComposerPackage;
+	protected ProjectComposerPackage $projectComposerPackage;
 
-    /** @var Copier */
-    protected Copier $copier;
+	/** @var Copier */
+	protected Copier $copier;
 
-    /** @var Prefixer */
-    protected Prefixer $replacer;
-    /**
-     * @var ChangeEnumerator
-     */
-    protected ChangeEnumerator $changeEnumerator;
+	/** @var Prefixer */
+	protected Prefixer $replacer;
+	/**
+	 * @var ChangeEnumerator
+	 */
+	protected ChangeEnumerator $changeEnumerator;
 
 
-    /**
-     * @return void
-     */
-    protected function configure()
-    {
-        $this->setName('compose');
-        $this->setDescription("Copy composer's `require` and prefix their namespace and classnames.");
-        $this->setHelp('');
-    }
+	/**
+	 * @return void
+	 */
+	protected function configure()
+	{
+		$this->setName('compose');
+		$this->setDescription("Copy composer's `require` and prefix their namespace and classnames.");
+		$this->setHelp('');
+	}
 
-    /**
-     * @see Command::execute()
-     *
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @return int
-     */
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $workingDir = getcwd() . DIRECTORY_SEPARATOR;
-        $this->workingDir = $workingDir;
+	/**
+	 * @see Command::execute()
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 * @return int
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output): int
+	{
+		$workingDir = getcwd() . DIRECTORY_SEPARATOR;
+		$this->workingDir = $workingDir;
 
-        try {
-            $this->loadProjectComposerPackage();
+		try {
+			$this->loadProjectComposerPackage();
 
-            $this->buildDependencyList();
+			$this->buildDependencyList();
 
-            $this->enumerateFiles();
+			$this->enumerateFiles();
 
-            $this->copyFiles();
+			$this->copyFiles();
 
-            $this->determineChanges();
+			$this->determineChanges();
 
-            $this->performReplacements();
+			$this->performReplacements();
 
-            $this->addLicenses();
-
-            $this->generateAutoloader();
+			$this->addLicenses();
+
+			$this->generateAutoloader();
 
-            $this->cleanUp();
-        } catch (Exception $e) {
-            $output->write($e->getMessage());
-            return 1;
-        }
+			$this->cleanUp();
+		} catch (Exception $e) {
+			$output->write($e->getMessage());
+			return 1;
+		}
 
-        // What should this be?!
-        return 0;
-    }
+		// What should this be?!
+		return 0;
+	}
 
 
-    /**
-     * 1. Load the composer.json.
-     *
-     * @throws Exception
-     */
-    protected function loadProjectComposerPackage()
-    {
+	/**
+	 * 1. Load the composer.json.
+	 *
+	 * @throws Exception
+	 */
+	protected function loadProjectComposerPackage()
+	{
 
-        $this->projectComposerPackage = new ProjectComposerPackage($this->workingDir . 'composer.json');
+		$this->projectComposerPackage = new ProjectComposerPackage($this->workingDir . 'composer.json');
 
-        $config = $this->projectComposerPackage->getStraussConfig();
+		$config = $this->projectComposerPackage->getStraussConfig();
 
-        $this->config = $config;
-    }
+		$this->config = $config;
+	}
 
 
-    /** @var ComposerPackage[] */
-    protected array $flatDependencyTree = [];
+	/** @var ComposerPackage[] */
+	protected array $flatDependencyTree = [];
 
-    /**
-     * 2. Built flat list of packages and dependencies.
-     *
-     * 2.1 Initiate getting dependencies for the project composer.json.
-     *
-     * @see Compose::flatDependencyTree
-     */
-    protected function buildDependencyList()
-    {
+	/**
+	 * 2. Built flat list of packages and dependencies.
+	 *
+	 * 2.1 Initiate getting dependencies for the project composer.json.
+	 *
+	 * @see Compose::flatDependencyTree
+	 */
+	protected function buildDependencyList()
+	{
 
-        $requiredPackageNames = $this->config->getPackages();
+		$requiredPackageNames = $this->config->getPackages();
 
-        // Unset PHP, ext-*.
-        $removePhpExt = function ($element) {
-            return !( 0 === strpos($element, 'ext') || 'php' === $element );
-        };
+		// Unset PHP, ext-*.
+		$removePhpExt = function ($element) {
+			return !( 0 === strpos($element, 'ext') || 'php' === $element );
+		};
 
-        $requiredPackageNames = array_filter($requiredPackageNames, $removePhpExt);
+		$requiredPackageNames = array_filter($requiredPackageNames, $removePhpExt);
 
-        foreach ($requiredPackageNames as $requiredPackageName) {
-            $packageDir = $this->workingDir . 'vendor' .DIRECTORY_SEPARATOR
-                . $requiredPackageName . DIRECTORY_SEPARATOR;
+		foreach ($requiredPackageNames as $requiredPackageName) {
+			$packageDir = $this->workingDir . 'vendor' .DIRECTORY_SEPARATOR
+				. $requiredPackageName . DIRECTORY_SEPARATOR;
 
-            $overrideAutoload = isset($this->config->getOverrideAutoload()[$requiredPackageName])
-                ? $this->config->getOverrideAutoload()[$requiredPackageName]
-                : null;
+			$overrideAutoload = isset($this->config->getOverrideAutoload()[$requiredPackageName])
+				? $this->config->getOverrideAutoload()[$requiredPackageName]
+				: null;
 
-            $requiredComposerPackage = new ComposerPackage($packageDir, $overrideAutoload);
-            $this->flatDependencyTree[$requiredComposerPackage->getName()] = $requiredComposerPackage;
-            $this->getAllDependencies($requiredComposerPackage);
-        }
-    }
-
-    /**
-     * 2.2 Recursive function to get dependencies.
-     *
-     * @param ComposerPackage $requiredDependency
-     */
-    protected function getAllDependencies(ComposerPackage $requiredDependency): void
-    {
-        $excludedPackagesNames = $this->config->getExcludePackagesFromPrefixing();
+			$requiredComposerPackage = new ComposerPackage($packageDir, $overrideAutoload);
+			$this->flatDependencyTree[$requiredComposerPackage->getName()] = $requiredComposerPackage;
+			$this->getAllDependencies($requiredComposerPackage);
+		}
+	}
+
+	/**
+	 * 2.2 Recursive function to get dependencies.
+	 *
+	 * @param ComposerPackage $requiredDependency
+	 */
+	protected function getAllDependencies(ComposerPackage $requiredDependency): void
+	{
+		$excludedPackagesNames = $this->config->getExcludePackagesFromPrefixing();
 
-        // Unset PHP, ext-*.
-        $removePhpExt = function ($element) {
-            return !( 0 === strpos($element, 'ext') || 'php' === $element );
-        };
+		// Unset PHP, ext-*.
+		$removePhpExt = function ($element) {
+			return !( 0 === strpos($element, 'ext') || 'php' === $element );
+		};
 
-        $required = array_filter($requiredDependency->getRequiresNames(), $removePhpExt);
+		$required = array_filter($requiredDependency->getRequiresNames(), $removePhpExt);
 
-        foreach ($required as $dependencyName) {
-            if (in_array($dependencyName, $excludedPackagesNames)) {
-                continue;
-            }
+		foreach ($required as $dependencyName) {
+			if (in_array($dependencyName, $excludedPackagesNames)) {
+				continue;
+			}
 
-            $overrideAutoload = isset($this->config->getOverrideAutoload()[$dependencyName])
-                ? $this->config->getOverrideAutoload()[$dependencyName]
-                : null;
+			$overrideAutoload = isset($this->config->getOverrideAutoload()[$dependencyName])
+				? $this->config->getOverrideAutoload()[$dependencyName]
+				: null;
 
-            $dependencyComposerPackage = new ComposerPackage(
-                $this->workingDir . 'vendor' . DIRECTORY_SEPARATOR
-                . $dependencyName . DIRECTORY_SEPARATOR . 'composer.json',
-                $overrideAutoload
-            );
+			$dependencyComposerPackage = new ComposerPackage(
+				$this->workingDir . 'vendor' . DIRECTORY_SEPARATOR
+				. $dependencyName . DIRECTORY_SEPARATOR . 'composer.json',
+				$overrideAutoload
+			);
 
-            $this->flatDependencyTree[$dependencyName] = $dependencyComposerPackage;
-            $this->getAllDependencies($dependencyComposerPackage);
-        }
-    }
-
-    protected FileEnumerator $fileEnumerator;
-
-    protected function enumerateFiles()
-    {
-
-        $this->fileEnumerator = new FileEnumerator(
-            $this->flatDependencyTree,
-            $this->workingDir,
-            $this->config
-        );
+			$this->flatDependencyTree[$dependencyName] = $dependencyComposerPackage;
+			$this->getAllDependencies($dependencyComposerPackage);
+		}
+	}
+
+	protected FileEnumerator $fileEnumerator;
+
+	protected function enumerateFiles()
+	{
+
+		$this->fileEnumerator = new FileEnumerator(
+			$this->flatDependencyTree,
+			$this->workingDir,
+			$this->config
+		);
 
-        $this->fileEnumerator->compileFileList();
-    }
-
-    // 3. Copy autoloaded files for each
-    protected function copyFiles()
-    {
+		$this->fileEnumerator->compileFileList();
+	}
+
+	// 3. Copy autoloaded files for each
+	protected function copyFiles()
+	{
 
-        $this->copier = new Copier(
-            $this->fileEnumerator->getAllFilesAndDependencyList(),
-            $this->workingDir,
-            $this->config->getTargetDirectory()
-        );
-
-        $this->copier->prepareTarget();
-
-        $this->copier->copy();
-    }
-
-    // 4. Determine namespace and classname changes
-    protected function determineChanges()
-    {
-
-        $this->changeEnumerator = new ChangeEnumerator($this->config);
-
-        $relativeTargetDir = $this->config->getTargetDirectory();
-        $phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList();
-        $this->changeEnumerator->findInFiles($relativeTargetDir, $phpFiles);
-    }
-
-    // 5. Update namespaces and class names.
-    // Replace references to updated namespaces and classnames throughout the dependencies.
-    protected function performReplacements()
-    {
-        $this->replacer = new Prefixer($this->config, $this->workingDir);
-
-        $namespaces = $this->changeEnumerator->getDiscoveredNamespaceReplacements();
-        $classes = $this->changeEnumerator->getDiscoveredClasses();
+		$this->copier = new Copier(
+			$this->fileEnumerator->getAllFilesAndDependencyList(),
+			$this->workingDir,
+			$this->config->getTargetDirectory()
+		);
+
+		$this->copier->prepareTarget();
+
+		$this->copier->copy();
+	}
+
+	// 4. Determine namespace and classname changes
+	protected function determineChanges()
+	{
+
+		$this->changeEnumerator = new ChangeEnumerator($this->config);
+
+		$relativeTargetDir = $this->config->getTargetDirectory();
+		$phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList();
+		$this->changeEnumerator->findInFiles($relativeTargetDir, $phpFiles);
+	}
+
+	// 5. Update namespaces and class names.
+	// Replace references to updated namespaces and classnames throughout the dependencies.
+	protected function performReplacements()
+	{
+		$this->replacer = new Prefixer($this->config, $this->workingDir);
+
+		$namespaces = $this->changeEnumerator->getDiscoveredNamespaceReplacements();
+		$classes = $this->changeEnumerator->getDiscoveredClasses();
         
-        $phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList();
+		$phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList();
 
-        $this->replacer->replaceInFiles($namespaces, $classes, $phpFiles);
-    }
+		$this->replacer->replaceInFiles($namespaces, $classes, $phpFiles);
+	}
 
-    protected function addLicenses(): void
-    {
+	protected function addLicenses(): void
+	{
 
-        $author = $this->projectComposerPackage->getAuthor();
+		$author = $this->projectComposerPackage->getAuthor();
 
-        $dependencies = $this->flatDependencyTree;
+		$dependencies = $this->flatDependencyTree;
 
-        $licenser = new Licenser($this->config, $this->workingDir, $dependencies, $author);
+		$licenser = new Licenser($this->config, $this->workingDir, $dependencies, $author);
 
-        $licenser->copyLicenses();
+		$licenser->copyLicenses();
 
-        $modifiedFiles = $this->replacer->getModifiedFiles();
-        $licenser->addInformationToUpdatedFiles($modifiedFiles);
-    }
+		$modifiedFiles = $this->replacer->getModifiedFiles();
+		$licenser->addInformationToUpdatedFiles($modifiedFiles);
+	}
 
-    /**
-     * 6. Generate autoloader.
-     */
-    protected function generateAutoloader()
-    {
+	/**
+	 * 6. Generate autoloader.
+	 */
+	protected function generateAutoloader()
+	{
 
-        $files = $this->fileEnumerator->getFilesAutoloaders();
+		$files = $this->fileEnumerator->getFilesAutoloaders();
 
-        $classmap = new Autoload($this->config, $this->workingDir, $files);
+		$classmap = new Autoload($this->config, $this->workingDir, $files);
 
-        $classmap->generate();
-    }
+		$classmap->generate();
+	}
 
 
-    /**
-     * 7.
-     * Delete source files if desired.
-     * Delete empty directories in destination.
-     */
-    protected function cleanUp()
-    {
+	/**
+	 * 7.
+	 * Delete source files if desired.
+	 * Delete empty directories in destination.
+	 */
+	protected function cleanUp()
+	{
 
-        $cleanup = new Cleanup($this->config, $this->workingDir);
+		$cleanup = new Cleanup($this->config, $this->workingDir);
 
-        $sourceFiles = array_keys($this->fileEnumerator->getAllFilesAndDependencyList());
+		$sourceFiles = array_keys($this->fileEnumerator->getAllFilesAndDependencyList());
 
-        // This will check the config to check should it delete or not.
-        $cleanup->cleanup($sourceFiles);
-    }
+		// This will check the config to check should it delete or not.
+		$cleanup->cleanup($sourceFiles);
+	}
 }

Spacing +38 added lines, -38 removed lines

@@ -43,9 +43,9 @@ 
      */
     protected function configure()
     {
-        $this->setName('compose');
-        $this->setDescription("Copy composer's `require` and prefix their namespace and classnames.");
-        $this->setHelp('');
+        $this->setName( 'compose' );
+        $this->setDescription( "Copy composer's `require` and prefix their namespace and classnames." );
+        $this->setHelp( '' );
     }
 
     /**
@@ -55,7 +55,7 @@ 
      * @param OutputInterface $output
      * @return int
      */
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function execute( InputInterface $input, OutputInterface $output ): int
     {
         $workingDir = getcwd() . DIRECTORY_SEPARATOR;
         $this->workingDir = $workingDir;
@@ -78,8 +78,8 @@ 
             $this->generateAutoloader();
 
             $this->cleanUp();
-        } catch (Exception $e) {
-            $output->write($e->getMessage());
+        } catch ( Exception $e ) {
+            $output->write( $e->getMessage() );
             return 1;
         }
 
@@ -96,7 +96,7 @@ 
     protected function loadProjectComposerPackage()
     {
 
-        $this->projectComposerPackage = new ProjectComposerPackage($this->workingDir . 'composer.json');
+        $this->projectComposerPackage = new ProjectComposerPackage( $this->workingDir . 'composer.json' );
 
         $config = $this->projectComposerPackage->getStraussConfig();
 
@@ -105,7 +105,7 @@ 
 
 
     /** @var ComposerPackage[] */
-    protected array $flatDependencyTree = [];
+    protected array $flatDependencyTree = [ ];
 
     /**
      * 2. Built flat list of packages and dependencies.
@@ -120,23 +120,23 @@ 
         $requiredPackageNames = $this->config->getPackages();
 
         // Unset PHP, ext-*.
-        $removePhpExt = function ($element) {
-            return !( 0 === strpos($element, 'ext') || 'php' === $element );
+        $removePhpExt = function( $element ) {
+            return ! ( 0 === strpos( $element, 'ext' ) || 'php' === $element );
         };
 
-        $requiredPackageNames = array_filter($requiredPackageNames, $removePhpExt);
+        $requiredPackageNames = array_filter( $requiredPackageNames, $removePhpExt );
 
-        foreach ($requiredPackageNames as $requiredPackageName) {
-            $packageDir = $this->workingDir . 'vendor' .DIRECTORY_SEPARATOR
+        foreach ( $requiredPackageNames as $requiredPackageName ) {
+            $packageDir = $this->workingDir . 'vendor' . DIRECTORY_SEPARATOR
                 . $requiredPackageName . DIRECTORY_SEPARATOR;
 
-            $overrideAutoload = isset($this->config->getOverrideAutoload()[$requiredPackageName])
-                ? $this->config->getOverrideAutoload()[$requiredPackageName]
+            $overrideAutoload = isset( $this->config->getOverrideAutoload()[ $requiredPackageName ] )
+                ? $this->config->getOverrideAutoload()[ $requiredPackageName ]
                 : null;
 
-            $requiredComposerPackage = new ComposerPackage($packageDir, $overrideAutoload);
-            $this->flatDependencyTree[$requiredComposerPackage->getName()] = $requiredComposerPackage;
-            $this->getAllDependencies($requiredComposerPackage);
+            $requiredComposerPackage = new ComposerPackage( $packageDir, $overrideAutoload );
+            $this->flatDependencyTree[ $requiredComposerPackage->getName() ] = $requiredComposerPackage;
+            $this->getAllDependencies( $requiredComposerPackage );
         }
     }
 
@@ -145,24 +145,24 @@ 
      *
      * @param ComposerPackage $requiredDependency
      */
-    protected function getAllDependencies(ComposerPackage $requiredDependency): void
+    protected function getAllDependencies( ComposerPackage $requiredDependency ): void
     {
         $excludedPackagesNames = $this->config->getExcludePackagesFromPrefixing();
 
         // Unset PHP, ext-*.
-        $removePhpExt = function ($element) {
-            return !( 0 === strpos($element, 'ext') || 'php' === $element );
+        $removePhpExt = function( $element ) {
+            return ! ( 0 === strpos( $element, 'ext' ) || 'php' === $element );
         };
 
-        $required = array_filter($requiredDependency->getRequiresNames(), $removePhpExt);
+        $required = array_filter( $requiredDependency->getRequiresNames(), $removePhpExt );
 
-        foreach ($required as $dependencyName) {
-            if (in_array($dependencyName, $excludedPackagesNames)) {
+        foreach ( $required as $dependencyName ) {
+            if ( in_array( $dependencyName, $excludedPackagesNames ) ) {
                 continue;
             }
 
-            $overrideAutoload = isset($this->config->getOverrideAutoload()[$dependencyName])
-                ? $this->config->getOverrideAutoload()[$dependencyName]
+            $overrideAutoload = isset( $this->config->getOverrideAutoload()[ $dependencyName ] )
+                ? $this->config->getOverrideAutoload()[ $dependencyName ]
                 : null;
 
             $dependencyComposerPackage = new ComposerPackage(
@@ -171,8 +171,8 @@ 
                 $overrideAutoload
             );
 
-            $this->flatDependencyTree[$dependencyName] = $dependencyComposerPackage;
-            $this->getAllDependencies($dependencyComposerPackage);
+            $this->flatDependencyTree[ $dependencyName ] = $dependencyComposerPackage;
+            $this->getAllDependencies( $dependencyComposerPackage );
         }
     }
 
@@ -209,25 +209,25 @@ 
     protected function determineChanges()
     {
 
-        $this->changeEnumerator = new ChangeEnumerator($this->config);
+        $this->changeEnumerator = new ChangeEnumerator( $this->config );
 
         $relativeTargetDir = $this->config->getTargetDirectory();
         $phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList();
-        $this->changeEnumerator->findInFiles($relativeTargetDir, $phpFiles);
+        $this->changeEnumerator->findInFiles( $relativeTargetDir, $phpFiles );
     }
 
     // 5. Update namespaces and class names.
     // Replace references to updated namespaces and classnames throughout the dependencies.
     protected function performReplacements()
     {
-        $this->replacer = new Prefixer($this->config, $this->workingDir);
+        $this->replacer = new Prefixer( $this->config, $this->workingDir );
 
         $namespaces = $this->changeEnumerator->getDiscoveredNamespaceReplacements();
         $classes = $this->changeEnumerator->getDiscoveredClasses();
         
         $phpFiles = $this->fileEnumerator->getPhpFilesAndDependencyList();
 
-        $this->replacer->replaceInFiles($namespaces, $classes, $phpFiles);
+        $this->replacer->replaceInFiles( $namespaces, $classes, $phpFiles );
     }
 
     protected function addLicenses(): void
@@ -237,12 +237,12 @@ 
 
         $dependencies = $this->flatDependencyTree;
 
-        $licenser = new Licenser($this->config, $this->workingDir, $dependencies, $author);
+        $licenser = new Licenser( $this->config, $this->workingDir, $dependencies, $author );
 
         $licenser->copyLicenses();
 
         $modifiedFiles = $this->replacer->getModifiedFiles();
-        $licenser->addInformationToUpdatedFiles($modifiedFiles);
+        $licenser->addInformationToUpdatedFiles( $modifiedFiles );
     }
 
     /**
@@ -253,7 +253,7 @@ 
 
         $files = $this->fileEnumerator->getFilesAutoloaders();
 
-        $classmap = new Autoload($this->config, $this->workingDir, $files);
+        $classmap = new Autoload( $this->config, $this->workingDir, $files );
 
         $classmap->generate();
     }
@@ -267,11 +267,11 @@ 
     protected function cleanUp()
     {
 
-        $cleanup = new Cleanup($this->config, $this->workingDir);
+        $cleanup = new Cleanup( $this->config, $this->workingDir );
 
-        $sourceFiles = array_keys($this->fileEnumerator->getAllFilesAndDependencyList());
+        $sourceFiles = array_keys( $this->fileEnumerator->getAllFilesAndDependencyList() );
 
         // This will check the config to check should it delete or not.
-        $cleanup->cleanup($sourceFiles);
+        $cleanup->cleanup( $sourceFiles );
     }
 }

Braces +10 added lines, -20 removed lines

@@ -17,8 +17,7 @@ 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class Compose extends Command
-{
+class Compose extends Command {
     /** @var string */
     protected string $workingDir;
 
@@ -41,8 +40,7 @@ 
     /**
      * @return void
      */
-    protected function configure()
-    {
+    protected function configure() {
         $this->setName('compose');
         $this->setDescription("Copy composer's `require` and prefix their namespace and classnames.");
         $this->setHelp('');
@@ -93,8 +91,7 @@ 
      *
      * @throws Exception
      */
-    protected function loadProjectComposerPackage()
-    {
+    protected function loadProjectComposerPackage() {
 
         $this->projectComposerPackage = new ProjectComposerPackage($this->workingDir . 'composer.json');
 
@@ -114,8 +111,7 @@ 
      *
      * @see Compose::flatDependencyTree
      */
-    protected function buildDependencyList()
-    {
+    protected function buildDependencyList() {
 
         $requiredPackageNames = $this->config->getPackages();
 
@@ -178,8 +174,7 @@ 
 
     protected FileEnumerator $fileEnumerator;
 
-    protected function enumerateFiles()
-    {
+    protected function enumerateFiles() {
 
         $this->fileEnumerator = new FileEnumerator(
             $this->flatDependencyTree,
@@ -191,8 +186,7 @@ 
     }
 
     // 3. Copy autoloaded files for each
-    protected function copyFiles()
-    {
+    protected function copyFiles() {
 
         $this->copier = new Copier(
             $this->fileEnumerator->getAllFilesAndDependencyList(),
@@ -206,8 +200,7 @@ 
     }
 
     // 4. Determine namespace and classname changes
-    protected function determineChanges()
-    {
+    protected function determineChanges() {
 
         $this->changeEnumerator = new ChangeEnumerator($this->config);
 
@@ -218,8 +211,7 @@ 
 
     // 5. Update namespaces and class names.
     // Replace references to updated namespaces and classnames throughout the dependencies.
-    protected function performReplacements()
-    {
+    protected function performReplacements() {
         $this->replacer = new Prefixer($this->config, $this->workingDir);
 
         $namespaces = $this->changeEnumerator->getDiscoveredNamespaceReplacements();
@@ -248,8 +240,7 @@ 
     /**
      * 6. Generate autoloader.
      */
-    protected function generateAutoloader()
-    {
+    protected function generateAutoloader() {
 
         $files = $this->fileEnumerator->getFilesAutoloaders();
 
@@ -264,8 +255,7 @@ 
      * Delete source files if desired.
      * Delete empty directories in destination.
      */
-    protected function cleanUp()
-    {
+    protected function cleanUp() {
 
         $cleanup = new Cleanup($this->config, $this->workingDir);
 

vendor/brianhenryie/strauss/src/Console/Application.php

Indentation +10 added lines, -10 removed lines

@@ -7,16 +7,16 @@
 
 class Application extends BaseApplication
 {
-    /**
-     * @param string $version
-     */
-    public function __construct(string $version)
-    {
-        parent::__construct('strauss', $version);
+	/**
+	 * @param string $version
+	 */
+	public function __construct(string $version)
+	{
+		parent::__construct('strauss', $version);
 
-        $composeCommand = new Compose();
-        $this->add($composeCommand);
+		$composeCommand = new Compose();
+		$this->add($composeCommand);
 
-        $this->setDefaultCommand('compose');
-    }
+		$this->setDefaultCommand('compose');
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -10,13 +10,13 @@
     /**
      * @param string $version
      */
-    public function __construct(string $version)
+    public function __construct( string $version )
     {
-        parent::__construct('strauss', $version);
+        parent::__construct( 'strauss', $version );
 
         $composeCommand = new Compose();
-        $this->add($composeCommand);
+        $this->add( $composeCommand );
 
-        $this->setDefaultCommand('compose');
+        $this->setDefaultCommand( 'compose' );
     }
 }

Braces +2 added lines, -4 removed lines

@@ -5,13 +5,11 @@
 use BrianHenryIE\Strauss\Console\Commands\Compose;
 use Symfony\Component\Console\Application as BaseApplication;
 
-class Application extends BaseApplication
-{
+class Application extends BaseApplication {
     /**
      * @param string $version
      */
-    public function __construct(string $version)
-    {
+    public function __construct(string $version) {
         parent::__construct('strauss', $version);
 
         $composeCommand = new Compose();

vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php

Indentation +148 added lines, -148 removed lines

@@ -27,164 +27,164 @@
  */
 
 if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
+	define('RANDOM_COMPAT_READ_BUFFER', 8);
 }
 
 if (!is_callable('random_bytes')) {
-    /**
-     * Unless open_basedir is enabled, use /dev/urandom for
-     * random numbers in accordance with best practices
-     *
-     * Why we use /dev/urandom and not /dev/random
-     * @ref https://www.2uo.de/myths-about-urandom
-     * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        /** @var resource $fp */
-        static $fp = null;
+	/**
+	 * Unless open_basedir is enabled, use /dev/urandom for
+	 * random numbers in accordance with best practices
+	 *
+	 * Why we use /dev/urandom and not /dev/random
+	 * @ref https://www.2uo.de/myths-about-urandom
+	 * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
+	 *
+	 * @param int $bytes
+	 *
+	 * @throws Exception
+	 *
+	 * @return string
+	 */
+	function random_bytes($bytes)
+	{
+		/** @var resource $fp */
+		static $fp = null;
 
-        /**
-         * This block should only be run once
-         */
-        if (empty($fp)) {
-            /**
-             * We don't want to ever read C:\dev\random, only /dev/urandom on
-             * Unix-like operating systems. While we guard against this
-             * condition in random.php, it doesn't hurt to be defensive in depth
-             * here.
-             *
-             * To that end, we only try to open /dev/urandom if we're on a Unix-
-             * like operating system (which means the directory separator is set
-             * to "/" not "\".
-             */
-            if (DIRECTORY_SEPARATOR === '/') {
-                if (!is_readable('/dev/urandom')) {
-                    throw new Exception(
-                        'Environment misconfiguration: ' .
-                        '/dev/urandom cannot be read.'
-                    );
-                }
-                /**
-                 * We use /dev/urandom if it is a char device.
-                 * We never fall back to /dev/random
-                 */
-                /** @var resource|bool $fp */
-                $fp = fopen('/dev/urandom', 'rb');
-                if (is_resource($fp)) {
-                    /** @var array<string, int> $st */
-                    $st = fstat($fp);
-                    if (($st['mode'] & 0170000) !== 020000) {
-                        fclose($fp);
-                        $fp = false;
-                    }
-                }
-            }
+		/**
+		 * This block should only be run once
+		 */
+		if (empty($fp)) {
+			/**
+			 * We don't want to ever read C:\dev\random, only /dev/urandom on
+			 * Unix-like operating systems. While we guard against this
+			 * condition in random.php, it doesn't hurt to be defensive in depth
+			 * here.
+			 *
+			 * To that end, we only try to open /dev/urandom if we're on a Unix-
+			 * like operating system (which means the directory separator is set
+			 * to "/" not "\".
+			 */
+			if (DIRECTORY_SEPARATOR === '/') {
+				if (!is_readable('/dev/urandom')) {
+					throw new Exception(
+						'Environment misconfiguration: ' .
+						'/dev/urandom cannot be read.'
+					);
+				}
+				/**
+				 * We use /dev/urandom if it is a char device.
+				 * We never fall back to /dev/random
+				 */
+				/** @var resource|bool $fp */
+				$fp = fopen('/dev/urandom', 'rb');
+				if (is_resource($fp)) {
+					/** @var array<string, int> $st */
+					$st = fstat($fp);
+					if (($st['mode'] & 0170000) !== 020000) {
+						fclose($fp);
+						$fp = false;
+					}
+				}
+			}
 
-            if (is_resource($fp)) {
-                /**
-                 * stream_set_read_buffer() does not exist in HHVM
-                 *
-                 * If we don't set the stream's read buffer to 0, PHP will
-                 * internally buffer 8192 bytes, which can waste entropy
-                 *
-                 * stream_set_read_buffer returns 0 on success
-                 */
-                if (is_callable('stream_set_read_buffer')) {
-                    stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
-                }
-                if (is_callable('stream_set_chunk_size')) {
-                    stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
-                }
-            }
-        }
+			if (is_resource($fp)) {
+				/**
+				 * stream_set_read_buffer() does not exist in HHVM
+				 *
+				 * If we don't set the stream's read buffer to 0, PHP will
+				 * internally buffer 8192 bytes, which can waste entropy
+				 *
+				 * stream_set_read_buffer returns 0 on success
+				 */
+				if (is_callable('stream_set_read_buffer')) {
+					stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+				}
+				if (is_callable('stream_set_chunk_size')) {
+					stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+				}
+			}
+		}
 
-        try {
-            /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
+		try {
+			/** @var int $bytes */
+			$bytes = RandomCompat_intval($bytes);
+		} catch (TypeError $ex) {
+			throw new TypeError(
+				'random_bytes(): $bytes must be an integer'
+			);
+		}
 
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
+		if ($bytes < 1) {
+			throw new Error(
+				'Length must be greater than 0'
+			);
+		}
 
-        /**
-         * This if() block only runs if we managed to open a file handle
-         *
-         * It does not belong in an else {} block, because the above
-         * if (empty($fp)) line is logic that should only be run once per
-         * page load.
-         */
-        if (is_resource($fp)) {
-            /**
-             * @var int
-             */
-            $remaining = $bytes;
+		/**
+		 * This if() block only runs if we managed to open a file handle
+		 *
+		 * It does not belong in an else {} block, because the above
+		 * if (empty($fp)) line is logic that should only be run once per
+		 * page load.
+		 */
+		if (is_resource($fp)) {
+			/**
+			 * @var int
+			 */
+			$remaining = $bytes;
 
-            /**
-             * @var string|bool
-             */
-            $buf = '';
+			/**
+			 * @var string|bool
+			 */
+			$buf = '';
 
-            /**
-             * We use fread() in a loop to protect against partial reads
-             */
-            do {
-                /**
-                 * @var string|bool
-                 */
-                $read = fread($fp, $remaining);
-                if (!is_string($read)) {
-                    /**
-                     * We cannot safely read from the file. Exit the
-                     * do-while loop and trigger the exception condition
-                     *
-                     * @var string|bool
-                     */
-                    $buf = false;
-                    break;
-                }
-                /**
-                 * Decrease the number of bytes returned from remaining
-                 */
-                $remaining -= RandomCompat_strlen($read);
-                /**
-                 * @var string $buf
-                 */
-                $buf .= $read;
-            } while ($remaining > 0);
+			/**
+			 * We use fread() in a loop to protect against partial reads
+			 */
+			do {
+				/**
+				 * @var string|bool
+				 */
+				$read = fread($fp, $remaining);
+				if (!is_string($read)) {
+					/**
+					 * We cannot safely read from the file. Exit the
+					 * do-while loop and trigger the exception condition
+					 *
+					 * @var string|bool
+					 */
+					$buf = false;
+					break;
+				}
+				/**
+				 * Decrease the number of bytes returned from remaining
+				 */
+				$remaining -= RandomCompat_strlen($read);
+				/**
+				 * @var string $buf
+				 */
+				$buf .= $read;
+			} while ($remaining > 0);
 
-            /**
-             * Is our result valid?
-             * @var string|bool $buf
-             */
-            if (is_string($buf)) {
-                if (RandomCompat_strlen($buf) === $bytes) {
-                    /**
-                     * Return our random entropy buffer here:
-                     */
-                    return $buf;
-                }
-            }
-        }
+			/**
+			 * Is our result valid?
+			 * @var string|bool $buf
+			 */
+			if (is_string($buf)) {
+				if (RandomCompat_strlen($buf) === $bytes) {
+					/**
+					 * Return our random entropy buffer here:
+					 */
+					return $buf;
+				}
+			}
+		}
 
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Error reading from source device'
-        );
-    }
+		/**
+		 * If we reach here, PHP has failed us.
+		 */
+		throw new Exception(
+			'Error reading from source device'
+		);
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -26,11 +26,11 @@ 
  * SOFTWARE.
  */
 
-if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
+if ( ! defined( 'RANDOM_COMPAT_READ_BUFFER' ) ) {
+    define( 'RANDOM_COMPAT_READ_BUFFER', 8 );
 }
 
-if (!is_callable('random_bytes')) {
+if ( ! is_callable( 'random_bytes' ) ) {
     /**
      * Unless open_basedir is enabled, use /dev/urandom for
      * random numbers in accordance with best practices
@@ -45,7 +45,7 @@ 
      *
      * @return string
      */
-    function random_bytes($bytes)
+    function random_bytes( $bytes )
     {
         /** @var resource $fp */
         static $fp = null;
@@ -53,7 +53,7 @@ 
         /**
          * This block should only be run once
          */
-        if (empty($fp)) {
+        if ( empty( $fp ) ) {
             /**
              * We don't want to ever read C:\dev\random, only /dev/urandom on
              * Unix-like operating systems. While we guard against this
@@ -64,8 +64,8 @@ 
              * like operating system (which means the directory separator is set
              * to "/" not "\".
              */
-            if (DIRECTORY_SEPARATOR === '/') {
-                if (!is_readable('/dev/urandom')) {
+            if ( DIRECTORY_SEPARATOR === '/' ) {
+                if ( ! is_readable( '/dev/urandom' ) ) {
                     throw new Exception(
                         'Environment misconfiguration: ' .
                         '/dev/urandom cannot be read.'
@@ -76,18 +76,18 @@ 
                  * We never fall back to /dev/random
                  */
                 /** @var resource|bool $fp */
-                $fp = fopen('/dev/urandom', 'rb');
-                if (is_resource($fp)) {
+                $fp = fopen( '/dev/urandom', 'rb' );
+                if ( is_resource( $fp ) ) {
                     /** @var array<string, int> $st */
-                    $st = fstat($fp);
-                    if (($st['mode'] & 0170000) !== 020000) {
-                        fclose($fp);
+                    $st = fstat( $fp );
+                    if ( ( $st[ 'mode' ] & 0170000 ) !== 020000 ) {
+                        fclose( $fp );
                         $fp = false;
                     }
                 }
             }
 
-            if (is_resource($fp)) {
+            if ( is_resource( $fp ) ) {
                 /**
                  * stream_set_read_buffer() does not exist in HHVM
                  *
@@ -96,25 +96,25 @@ 
                  *
                  * stream_set_read_buffer returns 0 on success
                  */
-                if (is_callable('stream_set_read_buffer')) {
-                    stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+                if ( is_callable( 'stream_set_read_buffer' ) ) {
+                    stream_set_read_buffer( $fp, RANDOM_COMPAT_READ_BUFFER );
                 }
-                if (is_callable('stream_set_chunk_size')) {
-                    stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+                if ( is_callable( 'stream_set_chunk_size' ) ) {
+                    stream_set_chunk_size( $fp, RANDOM_COMPAT_READ_BUFFER );
                 }
             }
         }
 
         try {
             /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
+            $bytes = RandomCompat_intval( $bytes );
+        } catch ( TypeError $ex ) {
             throw new TypeError(
                 'random_bytes(): $bytes must be an integer'
             );
         }
 
-        if ($bytes < 1) {
+        if ( $bytes < 1 ) {
             throw new Error(
                 'Length must be greater than 0'
             );
@@ -127,7 +127,7 @@ 
          * if (empty($fp)) line is logic that should only be run once per
          * page load.
          */
-        if (is_resource($fp)) {
+        if ( is_resource( $fp ) ) {
             /**
              * @var int
              */
@@ -145,8 +145,8 @@ 
                 /**
                  * @var string|bool
                  */
-                $read = fread($fp, $remaining);
-                if (!is_string($read)) {
+                $read = fread( $fp, $remaining );
+                if ( ! is_string( $read ) ) {
                     /**
                      * We cannot safely read from the file. Exit the
                      * do-while loop and trigger the exception condition
@@ -159,19 +159,19 @@ 
                 /**
                  * Decrease the number of bytes returned from remaining
                  */
-                $remaining -= RandomCompat_strlen($read);
+                $remaining -= RandomCompat_strlen( $read );
                 /**
                  * @var string $buf
                  */
                 $buf .= $read;
-            } while ($remaining > 0);
+            } while ( $remaining > 0 );
 
             /**
              * Is our result valid?
              * @var string|bool $buf
              */
-            if (is_string($buf)) {
-                if (RandomCompat_strlen($buf) === $bytes) {
+            if ( is_string( $buf ) ) {
+                if ( RandomCompat_strlen( $buf ) === $bytes ) {
                     /**
                      * Return our random entropy buffer here:
                      */

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
      *
      * @return string
      */
-    function random_bytes($bytes)
-    {
+    function random_bytes($bytes) {
         /** @var resource $fp */
         static $fp = null;
 

vendor/paragonie/random_compat/lib/random_int.php

Indentation +200 added lines, -200 removed lines

@@ -1,204 +1,204 @@
 <?php
 
 if (!is_callable('random_int')) {
-    /**
-     * Random_* Compatibility Library
-     * for using the new PHP 7 random_* API in PHP 5 projects
-     *
-     * The MIT License (MIT)
-     *
-     * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
-     *
-     * Permission is hereby granted, free of charge, to any person obtaining a copy
-     * of this software and associated documentation files (the "Software"), to deal
-     * in the Software without restriction, including without limitation the rights
-     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-     * copies of the Software, and to permit persons to whom the Software is
-     * furnished to do so, subject to the following conditions:
-     *
-     * The above copyright notice and this permission notice shall be included in
-     * all copies or substantial portions of the Software.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-     * SOFTWARE.
-     */
-
-    /**
-     * Fetch a random integer between $min and $max inclusive
-     *
-     * @param int $min
-     * @param int $max
-     *
-     * @throws Exception
-     *
-     * @return int
-     */
-    function random_int($min, $max)
-    {
-        /**
-         * Type and input logic checks
-         *
-         * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-         * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-         * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
-         * lose precision, so the <= and => operators might accidentally let a float
-         * through.
-         */
-
-        try {
-            /** @var int $min */
-            $min = RandomCompat_intval($min);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_int(): $min must be an integer'
-            );
-        }
-
-        try {
-            /** @var int $max */
-            $max = RandomCompat_intval($max);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_int(): $max must be an integer'
-            );
-        }
-
-        /**
-         * Now that we've verified our weak typing system has given us an integer,
-         * let's validate the logic then we can move forward with generating random
-         * integers along a given range.
-         */
-        if ($min > $max) {
-            throw new Error(
-                'Minimum value must be less than or equal to the maximum value'
-            );
-        }
-
-        if ($max === $min) {
-            return (int) $min;
-        }
-
-        /**
-         * Initialize variables to 0
-         *
-         * We want to store:
-         * $bytes => the number of random bytes we need
-         * $mask => an integer bitmask (for use with the &) operator
-         *          so we can minimize the number of discards
-         */
-        $attempts = $bits = $bytes = $mask = $valueShift = 0;
-        /** @var int $attempts */
-        /** @var int $bits */
-        /** @var int $bytes */
-        /** @var int $mask */
-        /** @var int $valueShift */
-
-        /**
-         * At this point, $range is a positive number greater than 0. It might
-         * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
-         * a float and we will lose some precision.
-         *
-         * @var int|float $range
-         */
-        $range = $max - $min;
-
-        /**
-         * Test for integer overflow:
-         */
-        if (!is_int($range)) {
-
-            /**
-             * Still safely calculate wider ranges.
-             * Provided by @CodesInChaos, @oittaa
-             *
-             * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
-             *
-             * We use ~0 as a mask in this case because it generates all 1s
-             *
-             * @ref https://eval.in/400356 (32-bit)
-             * @ref http://3v4l.org/XX9r5  (64-bit)
-             */
-            $bytes = PHP_INT_SIZE;
-            /** @var int $mask */
-            $mask = ~0;
-
-        } else {
-
-            /**
-             * $bits is effectively ceil(log($range, 2)) without dealing with
-             * type juggling
-             */
-            while ($range > 0) {
-                if ($bits % 8 === 0) {
-                    ++$bytes;
-                }
-                ++$bits;
-                $range >>= 1;
-                /** @var int $mask */
-                $mask = $mask << 1 | 1;
-            }
-            $valueShift = $min;
-        }
-
-        /** @var int $val */
-        $val = 0;
-        /**
-         * Now that we have our parameters set up, let's begin generating
-         * random integers until one falls between $min and $max
-         */
-        /** @psalm-suppress RedundantCondition */
-        do {
-            /**
-             * The rejection probability is at most 0.5, so this corresponds
-             * to a failure probability of 2^-128 for a working RNG
-             */
-            if ($attempts > 128) {
-                throw new Exception(
-                    'random_int: RNG is broken - too many rejections'
-                );
-            }
-
-            /**
-             * Let's grab the necessary number of random bytes
-             */
-            $randomByteString = random_bytes($bytes);
-
-            /**
-             * Let's turn $randomByteString into an integer
-             *
-             * This uses bitwise operators (<< and |) to build an integer
-             * out of the values extracted from ord()
-             *
-             * Example: [9F] | [6D] | [32] | [0C] =>
-             *   159 + 27904 + 3276800 + 201326592 =>
-             *   204631455
-             */
-            $val &= 0;
-            for ($i = 0; $i < $bytes; ++$i) {
-                $val |= ord($randomByteString[$i]) << ($i * 8);
-            }
-            /** @var int $val */
-
-            /**
-             * Apply mask
-             */
-            $val &= $mask;
-            $val += $valueShift;
-
-            ++$attempts;
-            /**
-             * If $val overflows to a floating point number,
-             * ... or is larger than $max,
-             * ... or smaller than $min,
-             * then try again.
-             */
-        } while (!is_int($val) || $val > $max || $val < $min);
-
-        return (int) $val;
-    }
+	/**
+	 * Random_* Compatibility Library
+	 * for using the new PHP 7 random_* API in PHP 5 projects
+	 *
+	 * The MIT License (MIT)
+	 *
+	 * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+	 * SOFTWARE.
+	 */
+
+	/**
+	 * Fetch a random integer between $min and $max inclusive
+	 *
+	 * @param int $min
+	 * @param int $max
+	 *
+	 * @throws Exception
+	 *
+	 * @return int
+	 */
+	function random_int($min, $max)
+	{
+		/**
+		 * Type and input logic checks
+		 *
+		 * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+		 * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+		 * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
+		 * lose precision, so the <= and => operators might accidentally let a float
+		 * through.
+		 */
+
+		try {
+			/** @var int $min */
+			$min = RandomCompat_intval($min);
+		} catch (TypeError $ex) {
+			throw new TypeError(
+				'random_int(): $min must be an integer'
+			);
+		}
+
+		try {
+			/** @var int $max */
+			$max = RandomCompat_intval($max);
+		} catch (TypeError $ex) {
+			throw new TypeError(
+				'random_int(): $max must be an integer'
+			);
+		}
+
+		/**
+		 * Now that we've verified our weak typing system has given us an integer,
+		 * let's validate the logic then we can move forward with generating random
+		 * integers along a given range.
+		 */
+		if ($min > $max) {
+			throw new Error(
+				'Minimum value must be less than or equal to the maximum value'
+			);
+		}
+
+		if ($max === $min) {
+			return (int) $min;
+		}
+
+		/**
+		 * Initialize variables to 0
+		 *
+		 * We want to store:
+		 * $bytes => the number of random bytes we need
+		 * $mask => an integer bitmask (for use with the &) operator
+		 *          so we can minimize the number of discards
+		 */
+		$attempts = $bits = $bytes = $mask = $valueShift = 0;
+		/** @var int $attempts */
+		/** @var int $bits */
+		/** @var int $bytes */
+		/** @var int $mask */
+		/** @var int $valueShift */
+
+		/**
+		 * At this point, $range is a positive number greater than 0. It might
+		 * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
+		 * a float and we will lose some precision.
+		 *
+		 * @var int|float $range
+		 */
+		$range = $max - $min;
+
+		/**
+		 * Test for integer overflow:
+		 */
+		if (!is_int($range)) {
+
+			/**
+			 * Still safely calculate wider ranges.
+			 * Provided by @CodesInChaos, @oittaa
+			 *
+			 * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
+			 *
+			 * We use ~0 as a mask in this case because it generates all 1s
+			 *
+			 * @ref https://eval.in/400356 (32-bit)
+			 * @ref http://3v4l.org/XX9r5  (64-bit)
+			 */
+			$bytes = PHP_INT_SIZE;
+			/** @var int $mask */
+			$mask = ~0;
+
+		} else {
+
+			/**
+			 * $bits is effectively ceil(log($range, 2)) without dealing with
+			 * type juggling
+			 */
+			while ($range > 0) {
+				if ($bits % 8 === 0) {
+					++$bytes;
+				}
+				++$bits;
+				$range >>= 1;
+				/** @var int $mask */
+				$mask = $mask << 1 | 1;
+			}
+			$valueShift = $min;
+		}
+
+		/** @var int $val */
+		$val = 0;
+		/**
+		 * Now that we have our parameters set up, let's begin generating
+		 * random integers until one falls between $min and $max
+		 */
+		/** @psalm-suppress RedundantCondition */
+		do {
+			/**
+			 * The rejection probability is at most 0.5, so this corresponds
+			 * to a failure probability of 2^-128 for a working RNG
+			 */
+			if ($attempts > 128) {
+				throw new Exception(
+					'random_int: RNG is broken - too many rejections'
+				);
+			}
+
+			/**
+			 * Let's grab the necessary number of random bytes
+			 */
+			$randomByteString = random_bytes($bytes);
+
+			/**
+			 * Let's turn $randomByteString into an integer
+			 *
+			 * This uses bitwise operators (<< and |) to build an integer
+			 * out of the values extracted from ord()
+			 *
+			 * Example: [9F] | [6D] | [32] | [0C] =>
+			 *   159 + 27904 + 3276800 + 201326592 =>
+			 *   204631455
+			 */
+			$val &= 0;
+			for ($i = 0; $i < $bytes; ++$i) {
+				$val |= ord($randomByteString[$i]) << ($i * 8);
+			}
+			/** @var int $val */
+
+			/**
+			 * Apply mask
+			 */
+			$val &= $mask;
+			$val += $valueShift;
+
+			++$attempts;
+			/**
+			 * If $val overflows to a floating point number,
+			 * ... or is larger than $max,
+			 * ... or smaller than $min,
+			 * then try again.
+			 */
+		} while (!is_int($val) || $val > $max || $val < $min);
+
+		return (int) $val;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!is_callable('random_int')) {
+if ( ! is_callable( 'random_int' ) ) {
     /**
      * Random_* Compatibility Library
      * for using the new PHP 7 random_* API in PHP 5 projects
@@ -38,7 +38,7 @@ 
      *
      * @return int
      */
-    function random_int($min, $max)
+    function random_int( $min, $max )
     {
         /**
          * Type and input logic checks
@@ -52,8 +52,8 @@ 
 
         try {
             /** @var int $min */
-            $min = RandomCompat_intval($min);
-        } catch (TypeError $ex) {
+            $min = RandomCompat_intval( $min );
+        } catch ( TypeError $ex ) {
             throw new TypeError(
                 'random_int(): $min must be an integer'
             );
@@ -61,8 +61,8 @@ 
 
         try {
             /** @var int $max */
-            $max = RandomCompat_intval($max);
-        } catch (TypeError $ex) {
+            $max = RandomCompat_intval( $max );
+        } catch ( TypeError $ex ) {
             throw new TypeError(
                 'random_int(): $max must be an integer'
             );
@@ -73,14 +73,14 @@ 
          * let's validate the logic then we can move forward with generating random
          * integers along a given range.
          */
-        if ($min > $max) {
+        if ( $min > $max ) {
             throw new Error(
                 'Minimum value must be less than or equal to the maximum value'
             );
         }
 
-        if ($max === $min) {
-            return (int) $min;
+        if ( $max === $min ) {
+            return (int)$min;
         }
 
         /**
@@ -110,7 +110,7 @@ 
         /**
          * Test for integer overflow:
          */
-        if (!is_int($range)) {
+        if ( ! is_int( $range ) ) {
 
             /**
              * Still safely calculate wider ranges.
@@ -133,8 +133,8 @@ 
              * $bits is effectively ceil(log($range, 2)) without dealing with
              * type juggling
              */
-            while ($range > 0) {
-                if ($bits % 8 === 0) {
+            while ( $range > 0 ) {
+                if ( $bits % 8 === 0 ) {
                     ++$bytes;
                 }
                 ++$bits;
@@ -157,7 +157,7 @@ 
              * The rejection probability is at most 0.5, so this corresponds
              * to a failure probability of 2^-128 for a working RNG
              */
-            if ($attempts > 128) {
+            if ( $attempts > 128 ) {
                 throw new Exception(
                     'random_int: RNG is broken - too many rejections'
                 );
@@ -166,7 +166,7 @@ 
             /**
              * Let's grab the necessary number of random bytes
              */
-            $randomByteString = random_bytes($bytes);
+            $randomByteString = random_bytes( $bytes );
 
             /**
              * Let's turn $randomByteString into an integer
@@ -179,8 +179,8 @@ 
              *   204631455
              */
             $val &= 0;
-            for ($i = 0; $i < $bytes; ++$i) {
-                $val |= ord($randomByteString[$i]) << ($i * 8);
+            for ( $i = 0; $i < $bytes; ++$i ) {
+                $val |= ord( $randomByteString[ $i ] ) << ( $i * 8 );
             }
             /** @var int $val */
 
@@ -197,8 +197,8 @@ 
              * ... or smaller than $min,
              * then try again.
              */
-        } while (!is_int($val) || $val > $max || $val < $min);
+        } while ( ! is_int( $val ) || $val > $max || $val < $min );
 
-        return (int) $val;
+        return (int)$val;
     }
 }

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
      *
      * @return int
      */
-    function random_int($min, $max)
-    {
+    function random_int($min, $max) {
         /**
          * Type and input logic checks
          *