Re-organize old tests and setup new phpunit configuration.

phpunit.xml.dist

@@ -10,7 +10,8 @@
     verbose="true">
     <testsuites>
         <testsuite name="Themosis framework">
-            <directory suffix="Test.php">./tests/</directory>
+            <directory suffix="Test.php">./tests</directory>
+            <exclude>./tests/deprecated</exclude>
         </testsuite>
     </testsuites>
 </phpunit>

src/Asset/Asset.php

@@ -155,7 +155,7 @@ protected function parseVersion($version)
     protected function parseMixed($mixed)
     {
         if ('style' === $this->type) {
-            $mixed = (is_string($mixed) && !empty($mixed)) ? $mixed : 'all';
+            $mixed = (is_string($mixed) && ! empty($mixed)) ? $mixed : 'all';
         } elseif ('script' === $this->type) {
             $mixed = is_bool($mixed) ? $mixed : false;
         }
@@ -337,7 +337,7 @@ public function install()
             // Front-end assets.
             case 'wp_enqueue_scripts':
 
-                if (isset(static::$instances['front']) && !empty(static::$instances['front'])) {
+                if (isset(static::$instances['front']) && ! empty(static::$instances['front'])) {
                     foreach (static::$instances['front'] as $asset) {
                         // Check if asset has not yet been called...
                         if (isset(static::$instantiated['front'][$asset->getKey()])) {
@@ -353,7 +353,7 @@ public function install()
             // WordPress admin assets.
             case 'admin_enqueue_scripts':
 
-                if (isset(static::$instances['admin']) && !empty(static::$instances['admin'])) {
+                if (isset(static::$instances['admin']) && ! empty(static::$instances['admin'])) {
                     foreach (static::$instances['admin'] as $asset) {
                         // Check if asset has not yet been called...
                         if (isset(static::$instantiated['admin'][$asset->getKey()])) {
@@ -369,7 +369,7 @@ public function install()
             // Login assets.
             case 'login_enqueue_scripts':
 
-                if (isset(static::$instances['login']) && !empty(static::$instances['login'])) {
+                if (isset(static::$instances['login']) && ! empty(static::$instances['login'])) {
                     foreach (static::$instances['login'] as $asset) {
                         // Check if asset has not yet been called...
                         if (isset(static::$instantiated['login'][$asset->getKey()])) {
@@ -384,7 +384,7 @@ public function install()
 
             case 'customize_preview_init':
 
-                if (isset(static::$instances['customizer']) && !empty(static::$instances['customizer'])) {
+                if (isset(static::$instances['customizer']) && ! empty(static::$instances['customizer'])) {
                     foreach (static::$instances['customizer'] as $asset) {
                         // Check if asset has not yet been called...
                         if (isset(static::$instantiated['customizer'][$asset->getKey()])) {
@@ -433,7 +433,7 @@ protected function registerScript(Asset $asset)
         wp_enqueue_script($args['handle'], $args['path'], $args['deps'], $args['version'], $args['mixed']);
 
         // Add localized data for scripts.
-        if (isset($args['localize']) && !empty($args['localize'])) {
+        if (isset($args['localize']) && ! empty($args['localize'])) {
             foreach ($args['localize'] as $objectName => $data) {
                 wp_localize_script($args['handle'], $objectName, $data);
             }
@@ -466,7 +466,7 @@ protected function registerInline(Asset $asset)
     {
         $args = $asset->getArgs();
 
-        if (empty($args) || !isset($args['inline'])) {
+        if (empty($args) || ! isset($args['inline'])) {
             return;
         }
 
@@ -502,7 +502,7 @@ public function getType()
      */
     public function getArgs($name = '')
     {
-        if (!empty($name) && array_key_exists($name, $this->args)) {
+        if (! empty($name) && array_key_exists($name, $this->args)) {
             return $this->args[$name];
         }
 

src/Asset/AssetFactory.php

@@ -61,13 +61,13 @@ public function __construct(AssetFinder $finder, Application $container)
      * @param bool|string $mixed   Boolean if javascript file | String if stylesheet file.
      * @param string      $type    'script' or 'style'.
      *
-     * @return Asset|\WP_Error
-     *
      * @throws AssetException
+     *
+     * @return Asset|\WP_Error
      */
     public function add($handle, $path, $deps = [], $version = '1.0', $mixed = null, $type = '')
     {
-        if (!is_string($handle) && !is_string($path)) {
+        if (! is_string($handle) && ! is_string($path)) {
             throw new AssetException('Invalid parameters for [Asset::add] method.');
         }
 
@@ -84,7 +84,7 @@ public function add($handle, $path, $deps = [], $version = '1.0', $mixed = null,
         $ext = pathinfo($path, PATHINFO_EXTENSION);
 
         // Define the asset type.
-        if (!empty($type) && in_array($type, $this->allowedAssets)) {
+        if (! empty($type) && in_array($type, $this->allowedAssets)) {
             $t = $type;
         } elseif ($ext) {
             $t = ($ext === 'css') ? 'style' : 'script';

src/Asset/AssetFinder.php

@@ -25,7 +25,7 @@ class AssetFinder extends Finder
     public function addPaths(array $paths)
     {
         foreach ($paths as $url => $path) {
-            if (!is_numeric($url)) {
+            if (! is_numeric($url)) {
                 $this->addPath($url, $path);
             } else {
                 throw new AssetException('Please provide an URL as key and a PATH as value in order to find assets.');

src/Config/Constant.php

@@ -23,7 +23,7 @@ public function __construct(array $data)
      */
     public function make()
     {
-        if (!empty($this->data)) {
+        if (! empty($this->data)) {
             foreach ($this->data as $name => $value) {
                 $name = strtoupper($name);
                 defined($name) ? $name : define($name, $value);

src/Config/Menu.php

@@ -23,7 +23,7 @@ public function __construct(array $data)
      */
     public function make()
     {
-        if (is_array($this->data) && !empty($this->data)) {
+        if (is_array($this->data) && ! empty($this->data)) {
             $locations = [];
 
             foreach ($this->data as $slug => $desc) {

src/Config/Sidebar.php

@@ -21,7 +21,7 @@ public function __construct(array $data)
      */
     public function make()
     {
-        if (is_array($this->data) && !empty($this->data)) {
+        if (is_array($this->data) && ! empty($this->data)) {
             foreach ($this->data as $sidebar) {
                 register_sidebar($sidebar);
             }

src/Config/Support.php

@@ -23,7 +23,7 @@ public function __construct(array $data)
      */
     public function make()
     {
-        if (is_array($this->data) && !empty($this->data)) {
+        if (is_array($this->data) && ! empty($this->data)) {
             foreach ($this->data as $feature => $value) {
                 // Allow theme features without options.
                 if (is_int($feature)) {

src/Config/Template.php

@@ -72,7 +72,7 @@ protected function getTemplates(array $default)
                 }
 
                 // 2.2 - $properties is an array.
-                if (is_array($properties) && !empty($properties)) {
+                if (is_array($properties) && ! empty($properties)) {
                     // 2.2.1 - $properties has only one value, meaning it's a display name and only
                     // available to page.
                     if (1 === count($properties) && is_string($properties[0])) {
@@ -88,7 +88,7 @@ protected function getTemplates(array $default)
                             $post_type = trim($post_type);
 
                             // A - Verify if $post_type exists. If not, add it.
-                            if (!isset($templates[$post_type])) {
+                            if (! isset($templates[$post_type])) {
                                 $templates[$post_type] = [];
                             }
 

src/Database/DatabaseServiceProvider.php

@@ -8,7 +8,7 @@ class DatabaseServiceProvider extends ServiceProvider
 {
     public function register()
     {
-        if (!isset($GLOBALS['themosis.capsule'])) {
+        if (! isset($GLOBALS['themosis.capsule'])) {
             return;
         }
 
@@ -19,7 +19,7 @@ public function register()
              * Bring the illuminate fluent (as config) for capsule compatibility
              * if not defined in the service container.
              */
-            if (!$container->bound('config')) {
+            if (! $container->bound('config')) {
 
                 /*
                  * Retrieve the default container created by the "Capsule"

src/Field/Fields/FieldBuilder.php

@@ -118,7 +118,7 @@ protected function setType()
             // $type is an array, let's check its values.
             $type = array_intersect($type, $allowed);
 
-            if (!empty($type)) {
+            if (! empty($type)) {
                 $features['type'] = $type;
             } else {
                 $features['type'] = $allowed;

src/Field/Fields/InfiniteField.php

@@ -34,7 +34,7 @@ public function __construct(array $properties, Factory $view)
      */
     protected function setRows()
     {
-        $this->rows = (is_array($this['value']) && !empty($this['value'])) ? count($this['value']) : 1;
+        $this->rows = (is_array($this['value']) && ! empty($this['value'])) ? count($this['value']) : 1;
     }
 
     /**

src/Field/Fields/Views/metabox/_themosisCollectionField.blade.php

@@ -61,7 +61,7 @@
         <!-- End collection -->
     </div>
     <div class="themosis-collection-buttons">
-        <button id="themosis-collection-add" type="button" class="button button-primary <?php if ($field['features']['limit'] && !empty($field['value']) && is_array($field['value']) && $field['features']['limit'] <= count($field['value'])) {
+        <button id="themosis-collection-add" type="button" class="button button-primary <?php if ($field['features']['limit'] && ! empty($field['value']) && is_array($field['value']) && $field['features']['limit'] <= count($field['value'])) {
                                     echo('disabled');
                                 } ?>"><?php _e('Add'); ?></button>
         <button id="themosis-collection-remove" type="button" class="button button-primary themosis-button-remove"><?php _e('Remove'); ?></button>

src/Field/Fields/Views/metabox/_themosisMediaField.blade.php

@@ -10,7 +10,7 @@
                     $isFile = false;
                     $src = '';
 
-                    if (!empty($field['value']) && is_numeric($field['value'])) {
+                    if (! empty($field['value']) && is_numeric($field['value'])) {
                         if (wp_attachment_is_image($field['value'])) {
                             $src = wp_get_attachment_image_src($field['value'], '_themosis_media');
                             $src = $src[0];
@@ -29,7 +29,7 @@
                 <div class="filename <?php if ($isFile) {
                     echo('show');
                 } ?>">
-                    <div><?php if (!empty($field['value']) && is_numeric($field['value'])) {
+                    <div><?php if (! empty($field['value']) && is_numeric($field['value'])) {
                     echo(get_the_title($field['value']));
                 } ?></div>
                 </div>
@@ -44,7 +44,7 @@
                     <p class="themosis-media__path">{{ $field['value'] }}</p>
                 </div>
                 <div class="themosis-media__buttons">
-                    <button id="themosis-media-add" type="button" class="button button-primary <?php if (!empty($field['value'])) {
+                    <button id="themosis-media-add" type="button" class="button button-primary <?php if (! empty($field['value'])) {
                     echo('themosis-media--hidden');
                 } ?>"><?php _e('Add'); ?></button>
                     <button id="themosis-media-delete" type="button" class="button themosis-button-remove <?php if (empty($field['value'])) {

src/Finder/Finder.php

@@ -37,7 +37,7 @@ abstract class Finder implements IFinder
      */
     protected function addPath($key, $path)
     {
-        if (!in_array($path, $this->paths)) {
+        if (! in_array($path, $this->paths)) {
             if (is_numeric($key)) {
                 $this->paths[] = $path;
             } else {
@@ -89,9 +89,9 @@ public function getFiles()
      *
      * @param string $name The file name or relative path.
      *
-     * @return string
-     *
      * @throws FinderException
+     *
+     * @return string
      */
     public function find($name)
     {

src/Foundation/Application.php

@@ -133,6 +133,7 @@ public function basePath($path = '')
      * Set the base path for the application.
      *
      * @param string $basePath
+     *
      * @return $this
      */
     public function setBasePath($basePath)
@@ -145,8 +146,6 @@ public function setBasePath($basePath)
 
     /**
      * Bind all of the application paths in the container.
-     *
-     * @return void
      */
     protected function bindPathsInContainer()
     {
@@ -188,6 +187,7 @@ protected function bindPathsInContainer()
      * Get the path to the application "themosis-application" directory.
      *
      * @param string $path
+     *
      * @return string
      */
     public function path($path = '')
@@ -259,6 +259,7 @@ public function applicationPath($path = '')
      * Get the path to the application "resources" directory.
      *
      * @param string $path
+     *
      * @return string
      */
     public function resourcePath($path = '')
@@ -399,8 +400,6 @@ public function isDownForMaintenance()
 
     /**
      * Register all of the configured providers.
-     *
-     * @return void
      */
     public function registerConfiguredProviders()
     {
@@ -410,9 +409,8 @@ public function registerConfiguredProviders()
     /**
      * Register a deferred provider and service.
      *
-     * @param  string $provider
-     * @param  string|null $service
-     * @return void
+     * @param string      $provider
+     * @param string|null $service
      */
     public function registerDeferredProvider($provider, $service = null)
     {
@@ -422,7 +420,7 @@ public function registerDeferredProvider($provider, $service = null)
 
         $this->register($instance = new $provider($this));
 
-        if (!$this->booted) {
+        if (! $this->booted) {
             $this->booting(function () use ($instance) {
                 $this->bootProvider($instance);
             });
@@ -431,8 +429,6 @@ public function registerDeferredProvider($provider, $service = null)
 
     /**
      * Boot the application's service providers.
-     *
-     * @return void
      */
     public function boot()
     {
@@ -456,8 +452,7 @@ protected function bootProvider(ServiceProvider $provider)
     /**
      * Register a new boot listener.
      *
-     * @param  mixed $callback
-     * @return void
+     * @param mixed $callback
      */
     public function booting($callback)
     {
@@ -467,8 +462,7 @@ public function booting($callback)
     /**
      * Register a new "booted" listener.
      *
-     * @param  mixed $callback
-     * @return void
+     * @param mixed $callback
      */
     public function booted($callback)
     {
@@ -502,13 +496,13 @@ public function getCachedPackagesPath()
      * and do its best to convert them to a Response instance.
      *
      * @param Request $request A Request instance
-     * @param int $type The type of the request
+     * @param int     $type    The type of the request
      *                         (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
-     * @param bool $catch Whether to catch exceptions or not
-     *
-     * @return Response A Response instance
+     * @param bool    $catch   Whether to catch exceptions or not
      *
      * @throws \Exception When an Exception occurs during processing
+     *
+     * @return Response A Response instance
      */
     public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
     {
@@ -518,15 +512,15 @@ public function handle(Request $request, $type = self::MASTER_REQUEST, $catch =
     /**
      * Register a service provider with the application.
      *
-     * @param  \Illuminate\Support\ServiceProvider|string $provider
-     * @param  array $options
-     * @param  bool $force
+     * @param \Illuminate\Support\ServiceProvider|string $provider
+     * @param array                                      $options
+     * @param bool                                       $force
      *
      * @return \Illuminate\Support\ServiceProvider
      */
     public function register($provider, $options = [], $force = false)
     {
-        if (($registered = $this->getProvider($provider)) && !$force) {
+        if (($registered = $this->getProvider($provider)) && ! $force) {
             return $registered;
         }