Update coding style

tattersoftware · Jan 4, 2022 · e6f273c · e6f273c
1 parent 2113ce4
commit e6f273c
Show file tree

Hide file tree

Showing 24 changed files with 1,147 additions and 1,210 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -10,25 +10,11 @@
     ->exclude('build')
     ->append([__FILE__]);
 
-// Remove overrides for incremental changes
-$overrides = [
-	'array_indentation' => false,
-	'braces'            => false,
-	'indentation_type'  => false,
-];
+$overrides = [];
 
 $options = [
     'finder'    => $finder,
     'cacheFile' => 'build/.php-cs-fixer.cache',
 ];
 
 return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
-
-/* Reenable For libraries after incremental changes are applied
-return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
-    'Tatter ________',
-    'Tatter Software',
-    '',
-    2021
-);
- */
diff --git a/examples/Handlers.php b/examples/Handlers.php
@@ -14,25 +14,25 @@
 
 class Handlers extends \Tatter\Handlers\Config\Handlers
 {
-	/**
-	 * Classes to ignore across all handlers.
-	 *
-	 * @var array<string>
-	 */
-	public $ignoredClasses = [];
+    /**
+     * Classes to ignore across all handlers.
+     *
+     * @var array<string>
+     */
+    public $ignoredClasses = [];
 
-	/**
-	 * Paths to check during automatic discovery.
-	 *
-	 * @var array<string>
-	 */
-	public $autoDiscover = [];
+    /**
+     * Paths to check during automatic discovery.
+     *
+     * @var array<string>
+     */
+    public $autoDiscover = [];
 
-	/**
-	 * Number of seconds to cache discovered handlers.
-	 * Null disables caching
-	 *
-	 * @var int|null
-	 */
-	public $cacheDuration = DAY;
+    /**
+     * Number of seconds to cache discovered handlers.
+     * Null disables caching
+     *
+     * @var int|null
+     */
+    public $cacheDuration = DAY;
 }
diff --git a/src/BaseHandler.php b/src/BaseHandler.php
@@ -6,23 +6,22 @@
 
 abstract class BaseHandler implements HandlerInterface
 {
-	use \Tatter\Handlers\Traits\HandlerTrait;
+    use \Tatter\Handlers\Traits\HandlerTrait;
 
-	/**
-	 * Attributes for Tatter\Handlers.
-	 *
-	 * @var array
-	 */
-	protected $attributes = [];
+    /**
+     * Attributes for Tatter\Handlers.
+     *
+     * @var array
+     */
+    protected $attributes = [];
 
-	/**
-	 * Checks for and merges default attributes.
-	 */
-	public function __construct()
-	{
-		if (property_exists($this, 'defaults') && is_array($this->defaults))
-		{
-			$this->attributes = array_merge($this->defaults, $this->attributes);
-		}
-	}
+    /**
+     * Checks for and merges default attributes.
+     */
+    public function __construct()
+    {
+        if (property_exists($this, 'defaults') && is_array($this->defaults)) {
+            $this->attributes = array_merge($this->defaults, $this->attributes);
+        }
+    }
 }
diff --git a/src/Commands/HandlersList.php b/src/Commands/HandlersList.php
@@ -8,42 +8,38 @@
 
 class HandlersList extends BaseCommand
 {
-	protected $group       = 'Housekeeping';
-	protected $name        = 'handlers:list';
-	protected $description = 'List all discovered handlers';
-	protected $usage       = 'handlers:list';
-
-	public function run(array $params = [])
-	{
-		// Load the library
-		$handlers = new Handlers();
-
-		// Make sure auto-discovery is enabled
-		if (empty($handlers->getConfig()->autoDiscover))
-		{
-			CLI::write('No paths are set for automatic discovery. See the config file for Tatter\Handlers.', 'yellow');
-
-			return;
-		}
-
-		// Process each path
-		foreach ($handlers->getConfig()->autoDiscover as $path)
-		{
-			$handlers->setPath($path);
-			CLI::write($path, 'black', 'light_gray');
-
-			if (! $classes = $handlers->findAll())
-			{
-				CLI::write('No handlers detected.', 'yellow');
-
-				continue;
-			}
-
-			// Display each class
-			foreach ($classes as $class)
-			{
-				CLI::write($class);
-			}
-		}
-	}
+    protected $group       = 'Housekeeping';
+    protected $name        = 'handlers:list';
+    protected $description = 'List all discovered handlers';
+    protected $usage       = 'handlers:list';
+
+    public function run(array $params = [])
+    {
+        // Load the library
+        $handlers = new Handlers();
+
+        // Make sure auto-discovery is enabled
+        if (empty($handlers->getConfig()->autoDiscover)) {
+            CLI::write('No paths are set for automatic discovery. See the config file for Tatter\Handlers.', 'yellow');
+
+            return;
+        }
+
+        // Process each path
+        foreach ($handlers->getConfig()->autoDiscover as $path) {
+            $handlers->setPath($path);
+            CLI::write($path, 'black', 'light_gray');
+
+            if (! $classes = $handlers->findAll()) {
+                CLI::write('No handlers detected.', 'yellow');
+
+                continue;
+            }
+
+            // Display each class
+            foreach ($classes as $class) {
+                CLI::write($class);
+            }
+        }
+    }
 }
diff --git a/src/Commands/HandlersRegister.php b/src/Commands/HandlersRegister.php
@@ -8,42 +8,38 @@
 
 class HandlersRegister extends BaseCommand
 {
-	protected $group       = 'Housekeeping';
-	protected $name        = 'handlers:register';
-	protected $description = 'Regsiter all discovered handlers';
-	protected $usage       = 'handlers:register';
-
-	public function run(array $params = [])
-	{
-		// Load the library
-		$handlers = new Handlers();
-
-		// Make sure auto-discovery is enabled
-		if (empty($handlers->getConfig()->autoDiscover))
-		{
-			CLI::write('No paths are set for automatic discovery. See the config file for Tatter\Handlers.', 'yellow');
-
-			return;
-		}
-
-		// Process each path
-		foreach ($handlers->getConfig()->autoDiscover as $path)
-		{
-			$handlers->setPath($path);
-			CLI::write($path, 'black', 'light_gray');
-
-			if (! $classes = $handlers->findAll())
-			{
-				CLI::write('No new handlers registered.', 'yellow');
-
-				continue;
-			}
-
-			// Display each class
-			foreach ($classes as $class)
-			{
-				CLI::write($class);
-			}
-		}
-	}
+    protected $group       = 'Housekeeping';
+    protected $name        = 'handlers:register';
+    protected $description = 'Regsiter all discovered handlers';
+    protected $usage       = 'handlers:register';
+
+    public function run(array $params = [])
+    {
+        // Load the library
+        $handlers = new Handlers();
+
+        // Make sure auto-discovery is enabled
+        if (empty($handlers->getConfig()->autoDiscover)) {
+            CLI::write('No paths are set for automatic discovery. See the config file for Tatter\Handlers.', 'yellow');
+
+            return;
+        }
+
+        // Process each path
+        foreach ($handlers->getConfig()->autoDiscover as $path) {
+            $handlers->setPath($path);
+            CLI::write($path, 'black', 'light_gray');
+
+            if (! $classes = $handlers->findAll()) {
+                CLI::write('No new handlers registered.', 'yellow');
+
+                continue;
+            }
+
+            // Display each class
+            foreach ($classes as $class) {
+                CLI::write($class);
+            }
+        }
+    }
 }
diff --git a/src/Commands/HandlersReset.php b/src/Commands/HandlersReset.php
@@ -8,31 +8,29 @@
 
 class HandlersReset extends BaseCommand
 {
-	protected $group       = 'Housekeeping';
-	protected $name        = 'handlers:reset';
-	protected $description = 'Clear cached versions of discovered handlers';
-	protected $usage       = 'handlers:reset';
-
-	public function run(array $params = [])
-	{
-		// Load the library
-		$handlers = new Handlers();
-
-		// Make sure auto-discovery is enabled
-		if (empty($handlers->getConfig()->autoDiscover))
-		{
-			CLI::write('No paths are set for automatic discovery. See the config file for Tatter\Handlers.', 'yellow');
-
-			return;
-		}
-
-		// Process each path
-		foreach ($handlers->getConfig()->autoDiscover as $path)
-		{
-			$handlers->setPath($path);
-			$handlers->cacheClear();
-		}
-
-		CLI::write('All cached handlers cleared!', 'green');
-	}
+    protected $group       = 'Housekeeping';
+    protected $name        = 'handlers:reset';
+    protected $description = 'Clear cached versions of discovered handlers';
+    protected $usage       = 'handlers:reset';
+
+    public function run(array $params = [])
+    {
+        // Load the library
+        $handlers = new Handlers();
+
+        // Make sure auto-discovery is enabled
+        if (empty($handlers->getConfig()->autoDiscover)) {
+            CLI::write('No paths are set for automatic discovery. See the config file for Tatter\Handlers.', 'yellow');
+
+            return;
+        }
+
+        // Process each path
+        foreach ($handlers->getConfig()->autoDiscover as $path) {
+            $handlers->setPath($path);
+            $handlers->cacheClear();
+        }
+
+        CLI::write('All cached handlers cleared!', 'green');
+    }
 }
diff --git a/src/Config/Handlers.php b/src/Config/Handlers.php
@@ -6,25 +6,25 @@
 
 class Handlers extends BaseConfig
 {
-	/**
-	 * Classes to ignore across all handlers.
-	 *
-	 * @var array<string>
-	 */
-	public $ignoredClasses = [];
+    /**
+     * Classes to ignore across all handlers.
+     *
+     * @var array<string>
+     */
+    public $ignoredClasses = [];
 
-	/**
-	 * Paths to check during automatic discovery.
-	 *
-	 * @var array<string>
-	 */
-	public $autoDiscover = [];
+    /**
+     * Paths to check during automatic discovery.
+     *
+     * @var array<string>
+     */
+    public $autoDiscover = [];
 
-	/**
-	 * Number of seconds to cache discovered handlers.
-	 * Null disables caching
-	 *
-	 * @var int|null
-	 */
-	public $cacheDuration = DAY;
+    /**
+     * Number of seconds to cache discovered handlers.
+     * Null disables caching
+     *
+     * @var int|null
+     */
+    public $cacheDuration = DAY;
 }