Merge pull request #359 from juzaweb/develop

V4 Develop to master

.env.example

@@ -10,8 +10,9 @@ DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=laravel
-DB_USERNAME=root
-DB_PASSWORD=
+DB_USERNAME=laravel
+DB_PASSWORD=laravel
+DB_PREFIX=jw_
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

.github/workflows/create-project.yml

@@ -22,7 +22,9 @@ jobs:
         image: mysql:${{ matrix.mysql }}
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: cms_test
+          MYSQL_DATABASE: laravel
+          MYSQL_USER: laravel
+          MYSQL_PASSWORD: laravel
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -38,9 +40,6 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install Dependencies
         run: composer create-project --prefer-dist juzaweb/cms blog ${{ matrix.version }}
-      - name: Copy .env
-        working-directory: blog
-        run: rm .env && cp .env.testing.example .env
       - name: Generate key
         working-directory: blog
         run: php artisan key:generate

.github/workflows/test.yml

@@ -10,7 +10,9 @@ jobs:
         image: mysql:8.0.21
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: cms_test
+          MYSQL_DATABASE: laravel
+          MYSQL_USER: laravel
+          MYSQL_PASSWORD: laravel
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -29,8 +31,6 @@ jobs:
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
           coverage: none
       - uses: actions/checkout@v2
-      - name: Copy .env
-        run: php -r "file_exists('.env') || copy('.env.testing.example', '.env');"
       - name: Install Dependencies
         run: composer install
       - name: Generate key
@@ -40,16 +40,8 @@ jobs:
       - name: Directory Permissions
         run: chmod -R 777 storage bootstrap/cache
       - name: Execute tests Install
-        run: php artisan test modules/Tests/InstallTest.php
+        run: php artisan test vendor/juzaweb/modules/modules/Tests/InstallTest.php
+      - name: Install example plugin to test
+        run: composer require juzaweb/example
       - name: Execute tests (Unit and Feature tests)
         run: php artisan test
-      - name: Execute tests disabled frontend
-        run:
-          php artisan test modules/Tests/Feature/Auth
-          php artisan test modules/Tests/Feature/Backend
-        env:
-          JW_FRONTEND_ENABLE: false
-      - name: Execute tests Update
-        run: php artisan test modules/Tests/UpdateTest.php
-      - name: Execute tests after Update
-        run: php artisan test

.gitignore

@@ -2,6 +2,7 @@
 /public/hot
 /public/storage
 /public/mix-manifest.json
+/public/vendor
 /storage/*.key
 /vendor
 .env
@@ -16,4 +17,3 @@ yarn-error.log
 /.vscode
 /.php-cs-fixer.cache
 /.deploy.yml
-/public/jw-styles/juzaweb/build

.php-cs-fixer.dist.php

@@ -51,5 +51,9 @@
         'method_argument_space' => ['ensure_fully_multiline' => false],
         'no_break_comment' => false,
         'blank_line_before_statement' => true,
+        'function_declaration' => [
+            'closure_fn_spacing' => 'none',
+            'closure_function_spacing' => 'one',
+        ],
     ])
     ->setFinder($finder);

README.md

@@ -3,7 +3,7 @@ JUZACMS - Laravel CMS for Your Project
 
 ## About
 ![https://buymeacoffee.com/juzaweb](https://i.imgur.com/toObY8s.png)
-[![Total Downloads](https://img.shields.io/packagist/dt/juzaweb/juzacms.svg?style=social)](https://packagist.org/packages/juzaweb/cms)
+[![Total Downloads](https://img.shields.io/packagist/dt/juzaweb/cms.svg?style=social)](https://packagist.org/packages/juzaweb/cms)
 [![GitHub Repo stars](https://img.shields.io/github/stars/juzaweb/cms?style=social)](https://github.com/juzaweb/cms)
 [![GitHub followers](https://img.shields.io/github/followers/juzaweb?style=social)](https://github.com/juzaweb)
 [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCo6Dz9HjjBOJpgWsxkln0-A?style=social)](https://www.youtube.com/@juzaweb)
@@ -90,7 +90,6 @@ View all [JuzaWeb CMS documentation](https://juzaweb.com/documentation/plugin/cm
   - [ ] Media api
 
 ## Plugins
-* [E-Commerce](https://github.com/juzaweb/ecommerce) (developing)
 * [Notification](https://github.com/juzaweb/notification)
 * [Movie](https://github.com/juzaweb/movie)
 * [Image Slider](https://github.com/juzaweb/image-slider)

_ide_helper.php

@@ -15639,206 +15639,6 @@ public static function flushMacros()
         }
     }
 
-    /**
-     *
-     *
-     * @see \Illuminate\Validation\Factory
-     */
-    class Validator
-    {
-        /**
-         * Create a new Validator instance.
-         *
-         * @param  array  $data
-         * @param  array  $rules
-         * @param  array  $messages
-         * @param  array  $customAttributes
-         * @return \Illuminate\Validation\Validator
-         * @static
-         */
-        public static function make($data, $rules, $messages = [], $customAttributes = [])
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            return $instance->make($data, $rules, $messages, $customAttributes);
-        }
-
-        /**
-         * Validate the given data against the provided rules.
-         *
-         * @param  array  $data
-         * @param  array  $rules
-         * @param  array  $messages
-         * @param  array  $customAttributes
-         * @return array
-         * @throws \Illuminate\Validation\ValidationException
-         * @static
-         */
-        public static function validate($data, $rules, $messages = [], $customAttributes = [])
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            return $instance->validate($data, $rules, $messages, $customAttributes);
-        }
-
-        /**
-         * Register a custom validator extension.
-         *
-         * @param  string  $rule
-         * @param  \Closure|string  $extension
-         * @param  string|null  $message
-         * @return void
-         * @static
-         */
-        public static function extend($rule, $extension, $message = null)
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            $instance->extend($rule, $extension, $message);
-        }
-
-        /**
-         * Register a custom implicit validator extension.
-         *
-         * @param  string  $rule
-         * @param  \Closure|string  $extension
-         * @param  string|null  $message
-         * @return void
-         * @static
-         */
-        public static function extendImplicit($rule, $extension, $message = null)
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            $instance->extendImplicit($rule, $extension, $message);
-        }
-
-        /**
-         * Register a custom dependent validator extension.
-         *
-         * @param  string  $rule
-         * @param  \Closure|string  $extension
-         * @param  string|null  $message
-         * @return void
-         * @static
-         */
-        public static function extendDependent($rule, $extension, $message = null)
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            $instance->extendDependent($rule, $extension, $message);
-        }
-
-        /**
-         * Register a custom validator message replacer.
-         *
-         * @param  string  $rule
-         * @param  \Closure|string  $replacer
-         * @return void
-         * @static
-         */
-        public static function replacer($rule, $replacer)
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            $instance->replacer($rule, $replacer);
-        }
-
-        /**
-         * Indicate that unvalidated array keys should be included in validated data when the parent array is validated.
-         *
-         * @return void
-         * @static
-         */
-        public static function includeUnvalidatedArrayKeys()
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            $instance->includeUnvalidatedArrayKeys();
-        }
-
-        /**
-         * Indicate that unvalidated array keys should be excluded from the validated data, even if the parent array
-         * was validated.
-         *
-         * @return void
-         * @static
-         */
-        public static function excludeUnvalidatedArrayKeys()
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            $instance->excludeUnvalidatedArrayKeys();
-        }
-
-        /**
-         * Set the Validator instance resolver.
-         *
-         * @param  \Closure  $resolver
-         * @return void
-         * @static
-         */
-        public static function resolver($resolver)
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            $instance->resolver($resolver);
-        }
-
-        /**
-         * Get the Translator implementation.
-         *
-         * @return \Illuminate\Contracts\Translation\Translator
-         * @static
-         */
-        public static function getTranslator()
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            return $instance->getTranslator();
-        }
-
-        /**
-         * Get the Presence Verifier implementation.
-         *
-         * @return \Illuminate\Validation\PresenceVerifierInterface
-         * @static
-         */
-        public static function getPresenceVerifier()
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            return $instance->getPresenceVerifier();
-        }
-
-        /**
-         * Set the Presence Verifier implementation.
-         *
-         * @param  \Illuminate\Validation\PresenceVerifierInterface  $presenceVerifier
-         * @return void
-         * @static
-         */
-        public static function setPresenceVerifier($presenceVerifier)
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            $instance->setPresenceVerifier($presenceVerifier);
-        }
-
-        /**
-         * Get the container instance used by the validation factory.
-         *
-         * @return \Illuminate\Contracts\Container\Container|null
-         * @static
-         */
-        public static function getContainer()
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            return $instance->getContainer();
-        }
-
-        /**
-         * Set the container instance used by the validation factory.
-         *
-         * @param  \Illuminate\Contracts\Container\Container  $container
-         * @return \Illuminate\Validation\Factory
-         * @static
-         */
-        public static function setContainer($container)
-        {
-            /** @var \Illuminate\Validation\Factory $instance */
-            return $instance->setContainer($container);
-        }
-    }
-
     /**
      *
      *
@@ -21993,7 +21793,7 @@ class Lang extends \Illuminate\Support\Facades\Lang
     }
 
     /**
-    * @method static jwResource(string $uri, string $controller)
+    * @method static jwResource(string $uri, string $controller, array $ontions = [])
      */
     class Route extends \Illuminate\Support\Facades\Route
     {

artisan

@@ -15,7 +15,7 @@ define('LARAVEL_START', microtime(true));
 |
 */
 
-require __DIR__.'/modules/autoload.php';
+require __DIR__.'/vendor/juzaweb/modules/autoload.php';
 
 $app = require_once __DIR__.'/bootstrap/app.php';