wait #4879 @0.25

diff --git a/.idea/csv-plugin.xml b/.idea/csv-plugin.xml
index 6143e0334f09e0d3d35e798e4b8db69c1bf2e7e2..1565b2079036982966f160630fadbbb5767f3a3c 100644 (file)
--- a/.idea/csv-plugin.xml
+++ b/.idea/csv-plugin.xml
@@ -52,6 +52,13 @@
             </Attribute>
           </value>
         </entry>
+        <entry key="\vendor\umpirsky\locale-list\data\ms_Latn_SG\locales.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
       </map>
     </option>
   </component>

diff --git a/.idea/php.xml b/.idea/php.xml
index 95d90e261ea9abea9c28c1922a4458951f96d05d..42cd772ceb4c92854553749e864a9c93b84e0a00 100644 (file)
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -189,6 +189,11 @@
       <path value="$PROJECT_DIR$/vendor/spatie/laravel-package-tools" />
       <path value="$PROJECT_DIR$/vendor/facade/ignition" />
       <path value="$PROJECT_DIR$/vendor/mxl/laravel-job" />
+      <path value="$PROJECT_DIR$/vendor/laravel-lang/lang" />
+      <path value="$PROJECT_DIR$/vendor/andrey-helldar/support" />
+      <path value="$PROJECT_DIR$/vendor/andrey-helldar/pretty-array" />
+      <path value="$PROJECT_DIR$/vendor/dragon-code/contracts" />
+      <path value="$PROJECT_DIR$/vendor/laravel-lang/publisher" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.4" />

diff --git a/composer.lock b/composer.lock
index 430afcf934c86695d5071f691550740b08863a9b..1f19ec6d625db09bb67141acac9f486eddd0c342 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -109,6 +109,167 @@
             },
             "time": "2020-02-12T19:35:11+00:00"
         },
+        {
+            "name": "andrey-helldar/pretty-array",
+            "version": "v2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/andrey-helldar/pretty-array.git",
+                "reference": "803dda6d40920ff402551f0445f220ae78bb20fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/andrey-helldar/pretty-array/zipball/803dda6d40920ff402551f0445f220ae78bb20fc",
+                "reference": "803dda6d40920ff402551f0445f220ae78bb20fc",
+                "shasum": ""
+            },
+            "require": {
+                "andrey-helldar/support": "^2.0|^3.0|^4.0",
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "php": "^7.2.5|^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.0|^9.0"
+            },
+            "suggest": {
+                "symfony/thanks": "Give thanks (in the form of a GitHub) to your fellow PHP package maintainers"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Helldar\\PrettyArray\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andrey Helldar",
+                    "email": "helldar@ai-rus.com"
+                }
+            ],
+            "description": "Simple conversion of an array to a pretty view.",
+            "keywords": [
+                "array",
+                "pretty",
+                "pretty array"
+            ],
+            "support": {
+                "issues": "https://github.com/andrey-helldar/pretty-array/issues",
+                "source": "https://github.com/andrey-helldar/pretty-array"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/helldar",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/andrey-helldar/pretty-array",
+                    "type": "tidelift"
+                }
+            ],
+            "abandoned": "dragon-code/pretty-array",
+            "time": "2021-07-06T20:35:58+00:00"
+        },
+        {
+            "name": "andrey-helldar/support",
+            "version": "v4.9.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/TheDragonCode/support.git",
+                "reference": "98fbba64decfb04cf4bc21d2847bc5240be06d74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/TheDragonCode/support/zipball/98fbba64decfb04cf4bc21d2847bc5240be06d74",
+                "reference": "98fbba64decfb04cf4bc21d2847bc5240be06d74",
+                "shasum": ""
+            },
+            "require": {
+                "dragon-code/contracts": "^1.0.1",
+                "ext-ctype": "*",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": "^7.2.5|^8.0",
+                "psr/http-message": "^1.0.1",
+                "voku/portable-ascii": "^1.4.8"
+            },
+            "conflict": {
+                "andrey-helldar/api-response": "<8.0",
+                "andrey-helldar/contracts": "*",
+                "andrey-helldar/lang-translations": "<3.0",
+                "andrey-helldar/laravel-lang-publisher": "<8.0",
+                "andrey-helldar/laravel-routes-core": "<2.0",
+                "andrey-helldar/pretty-array": "<2.0",
+                "andrey-helldar/pretty-routes": "<2.0",
+                "andrey-helldar/short-url": "<2.0"
+            },
+            "require-dev": {
+                "ext-bcmath": "*",
+                "phpunit/phpunit": "^8.0|^9.0",
+                "symfony/var-dumper": "^5.2"
+            },
+            "suggest": {
+                "andrey-helldar/laravel-support": "Various helper files for the Laravel and Lumen frameworks",
+                "ext-bcmath": "Require the extension if you will be using Helldar\\Support\\Facades\\Helpers\\Digit.",
+                "symfony/thanks": "Give thanks (in the form of a GitHub) to your fellow PHP package maintainers"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Helldar\\Support\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andrey Helldar",
+                    "email": "helldar@ai-rus.com"
+                }
+            ],
+            "description": "Support package is a collection of helpers and tools for any project.",
+            "keywords": [
+                "framework",
+                "helper",
+                "helpers",
+                "laravel",
+                "support",
+                "symfony",
+                "yii",
+                "yii2"
+            ],
+            "support": {
+                "issues": "https://github.com/andrey-helldar/support/issues",
+                "source": "https://github.com/andrey-helldar/support"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/helldar",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://yoomoney.ru/to/410012608840929",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://opencollective.com/dragon-code",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://www.patreon.com/andrey_helldar",
+                    "type": "patreon"
+                }
+            ],
+            "abandoned": "dragon-code/support",
+            "time": "2021-11-09T19:17:23+00:00"
+        },
         {
             "name": "backpack/backupmanager",
             "version": "v3.0.3",
@@ -1321,13 +1482,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "4b56609bfb475a1145c5b6da9745af89b79d2eea"
+                "reference": "de74a2f2d7afac2d552944f9c3e63d48ceeb612e"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-aaf93f.tar",
-                "reference": "4b56609bfb475a1145c5b6da9745af89b79d2eea",
-                "shasum": "687c642d9290ac29e5547a7af2dafce71858f62e"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-ae031e.tar",
+                "reference": "de74a2f2d7afac2d552944f9c3e63d48ceeb612e",
+                "shasum": "0540bc0b03688c73d29264e857638a64599e98c3"
             },
             "require": {
                 "backpack/backupmanager": "^3.0",
@@ -1352,6 +1513,8 @@
                 "fideloper/proxy": "^4.4",
                 "genealabs/laravel-model-caching": "^0.11",
                 "graham-campbell/markdown": "^v13.1",
+                "laravel-lang/lang": "^10.1",
+                "laravel-lang/publisher": "^10.3",
                 "laravel/framework": "^v8.69",
                 "lavary/laravel-menu": "^v1.8",
                 "league/commonmark": "^1.6",
@@ -1404,7 +1567,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2021-11-19T11:34:22+00:00"
+            "time": "2021-11-19T16:17:55+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -2422,6 +2585,69 @@
             ],
             "time": "2020-05-25T17:44:05+00:00"
         },
+        {
+            "name": "dragon-code/contracts",
+            "version": "v1.22.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/TheDragonCode/contracts.git",
+                "reference": "807f5e87003867c9ef2611fa6f7e69cbe828d4ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/TheDragonCode/contracts/zipball/807f5e87003867c9ef2611fa6f7e69cbe828d4ae",
+                "reference": "807f5e87003867c9ef2611fa6f7e69cbe828d4ae",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5|^8.0",
+                "psr/http-message": "^1.0.1",
+                "symfony/http-kernel": "^4.0|^5.0",
+                "symfony/polyfill-php80": "^1.23"
+            },
+            "require-dev": {
+                "illuminate/database": "^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Helldar\\Contracts\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andrey Helldar",
+                    "email": "helldar@ai-rus.com"
+                }
+            ],
+            "description": "A set of contracts for any project",
+            "keywords": [
+                "contracts",
+                "interfaces"
+            ],
+            "support": {
+                "source": "https://github.com/andrey-helldar/contracts"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/helldar",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://yoomoney.ru/to/410012608840929",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/andrey_helldar",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2021-10-21T21:43:22+00:00"
+        },
         {
             "name": "dragonmantank/cron-expression",
             "version": "v3.1.0",
@@ -3745,18 +3971,178 @@
             ],
             "time": "2020-06-13T08:05:20+00:00"
         },
+        {
+            "name": "laravel-lang/lang",
+            "version": "10.1.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Laravel-Lang/lang.git",
+                "reference": "24d97c725b46dab3ba7e8dc79522e789c787a5fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/24d97c725b46dab3ba7e8dc79522e789c787a5fb",
+                "reference": "24d97c725b46dab3ba7e8dc79522e789c787a5fb",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*"
+            },
+            "require-dev": {
+                "andrey-helldar/pretty-array": "^2.3",
+                "andrey-helldar/support": "^4.7",
+                "guzzlehttp/guzzle": "^7.3",
+                "laravel/breeze": "^1.2",
+                "laravel/fortify": "^1.7",
+                "laravel/jetstream": "^2.3",
+                "php": "^8.0",
+                "phpunit/phpunit": "^9.5",
+                "symfony/finder": "^5.2",
+                "symfony/var-dumper": "^5.2",
+                "vlucas/phpdotenv": "^5.3"
+            },
+            "suggest": {
+                "andrey-helldar/laravel-lang-publisher": "Easy installation and update of translation files for your project",
+                "arcanedev/laravel-lang": "Translations manager and checker for Laravel 5",
+                "overtrue/laravel-lang": "Command to add languages in your project"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laravel-Lang Team",
+                    "homepage": "https://github.com/Laravel-Lang"
+                }
+            ],
+            "description": "Languages for Laravel",
+            "keywords": [
+                "lang",
+                "languages",
+                "laravel",
+                "lpm"
+            ],
+            "support": {
+                "issues": "https://github.com/Laravel-Lang/lang/issues",
+                "source": "https://github.com/Laravel-Lang/lang"
+            },
+            "time": "2021-11-03T17:25:12+00:00"
+        },
+        {
+            "name": "laravel-lang/publisher",
+            "version": "v10.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Laravel-Lang/publisher.git",
+                "reference": "398466d8b799408fe0ec9f9b42551caa3fb8577b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Laravel-Lang/publisher/zipball/398466d8b799408fe0ec9f9b42551caa3fb8577b",
+                "reference": "398466d8b799408fe0ec9f9b42551caa3fb8577b",
+                "shasum": ""
+            },
+            "require": {
+                "andrey-helldar/pretty-array": "^2.4",
+                "andrey-helldar/support": "^4.9.1",
+                "dragon-code/contracts": "^1.21.1",
+                "ext-json": "*",
+                "illuminate/console": "^7.0|^8.0|^9.0",
+                "illuminate/contracts": "^7.0|^8.0|^9.0",
+                "illuminate/support": "^7.0|^8.0|^9.0",
+                "laravel-lang/lang": "^10.1.9",
+                "php": "^7.3|^8.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^5.0|^6.0|^7.0",
+                "phpunit/phpunit": "^9.4",
+                "symfony/var-dumper": "^5.0|^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Helldar\\LaravelLangPublisher\\ServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Helldar\\LaravelLangPublisher\\": "src",
+                    "LaravelLang\\Lang\\": "packages/laravel-lang"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andrey Helldar",
+                    "email": "helldar@ai-rus.com"
+                }
+            ],
+            "description": "Publisher lang files for the Laravel and Lumen Frameworks, Jetstream, Fortify, Cashier, Spark and Nova from Laravel-Lang/lang",
+            "keywords": [
+                "breeze",
+                "cashier",
+                "fortify",
+                "framework",
+                "i18n",
+                "jetstream",
+                "lang",
+                "languages",
+                "laravel",
+                "locale",
+                "locales",
+                "localization",
+                "lpm",
+                "lumen",
+                "nova",
+                "publisher",
+                "spark",
+                "trans",
+                "translations",
+                "validations"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel-lang/laravel-lang-publisher/issues",
+                "source": "https://github.com/laravel-lang/laravel-lang-publisher"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/helldar",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://yoomoney.ru/to/410012608840929",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://opencollective.com/dragon-code",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://www.patreon.com/andrey_helldar",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2021-11-10T08:45:45+00:00"
+        },
         {
             "name": "laravel/framework",
-            "version": "v8.72.0",
+            "version": "v8.73.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "5168f8589195a5f48b9c41ad2eec77a6c15f14f3"
+                "reference": "f60e5ceccac453864edbf001b665450886cda8fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/5168f8589195a5f48b9c41ad2eec77a6c15f14f3",
-                "reference": "5168f8589195a5f48b9c41ad2eec77a6c15f14f3",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/f60e5ceccac453864edbf001b665450886cda8fc",
+                "reference": "f60e5ceccac453864edbf001b665450886cda8fc",
                 "shasum": ""
             },
             "require": {
@@ -3915,7 +4301,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-11-17T15:15:08+00:00"
+            "time": "2021-11-19T14:10:17+00:00"
         },
         {
             "name": "laravel/serializable-closure",

diff --git a/config/lang-publisher.php b/config/lang-publisher.php
new file mode 100644 (file)
index 0000000..d359b87
--- /dev/null
+++ b/config/lang-publisher.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the "andrey-helldar/laravel-lang-publisher" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@ai-rus.com>
+ *
+ * @copyright 2021 Andrey Helldar
+ *
+ * @license MIT
+ *
+ * @see https://github.com/andrey-helldar/laravel-lang-publisher
+ */
+
+declare(strict_types=1);
+
+return [
+    /*
+     * Determines what type of files to use when updating language files.
+     *
+     * `true` means inline files will be used.
+     * `false` means that default files will be used.
+     *
+     * The difference between them can be seen here:
+     * @see https://github.com/Laravel-Lang/lang/blob/master/script/en/validation.php
+     * @see https://github.com/Laravel-Lang/lang/blob/master/script/en/validation-inline.php
+     *
+     * By default, `true`.
+     */
+
+    'inline' => true,
+
+    /*
+     * Do arrays need to be aligned by keys before processing arrays?
+     *
+     * By default, true
+     */
+
+    'alignment' => true,
+
+    /*
+     * Key exclusion when combining.
+     */
+
+    'excludes' => [
+        // 'auth' => ['throttle'],
+        // 'pagination' => ['previous'],
+        // 'passwords' => ['reset', 'throttled', 'user'],
+        // '{locale}' => ['Confirm Password'],
+    ],
+
+    /*
+     * Change key case.
+     *
+     * Available values:
+     *
+     *   0 - Case does not change
+     *   1 - camelCase
+     *   2 - snake_case
+     *   3 - kebab-case
+     *   4 - PascalCase
+     *
+     * By default, 0
+     */
+
+    'case' => 0,
+
+    /*
+     * Determines from which plugins to synchronize localization files.
+     *
+     * @see https://github.com/andrey-helldar/translations-template
+     */
+
+    'plugins' => [
+        // \LaravelLang\HttpStatuses\Provider::class,
+    ],
+];

diff --git a/update b/update
index d91e7045ce0fa11eecd4fc6df712ba6450dde7bf..2fef21a7ae298e1191211271e8fbd90d8b421368 100644 (file)
--- a/update
+++ b/update
@@ -1,6 +1,7 @@
 #!/bin/sh
 /usr/bin/php8.0 /usr/local/bin/composer update
 /usr/bin/php8.0 /usr/local/bin/composer dump-autoload
+/usr/bin/php8.0 artisan lang:add fr en
 /usr/bin/php8.0 artisan cubist:magic:migrate
 /usr/bin/php8.0 artisan cubist:magic:generate
 /usr/bin/php8.0 artisan optimize:clear