wait #5437 @0.5

diff --git a/.docker/config/gitconfig b/.docker/config/gitconfig
index e853fd6f8c70b28763800cc49af70a6ac029fbfa..d59a7153915efd4d4f90180c97ed8f2538be1f93 100644 (file)
--- a/.docker/config/gitconfig
+++ b/.docker/config/gitconfig
@@ -1,2 +1,6 @@
 [safe]
        directory = *
+
+[user]
+    name = Fluidbook Toolbox
+    email = toolbox@fluidbook.com

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index fd741e8fe7044d7d92e879395eb92722aa32df41..90f366aa15b81cf43f0db78767bdf5e680fa340c 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -25,13 +25,18 @@ services:
     working_dir: /application
     environment:
       TZ: Europe/Paris
+      HOME: /application
     volumes:
       - '/data1/extranet/toolbox/.docker/config/ssh/:/root/.ssh/'
       - '/data1/extranet/toolbox/.docker/config/ssh/:/application/.ssh/'
       - '/data1/extranet/toolbox/.docker/config/supervisor/:/etc/supervisor/conf.d/'
       - '/data1/extranet/toolbox/.docker/config/composer/:/root/.config/composer/'
+      - '/data1/extranet/toolbox/.docker/config/composer/:/application/.config/composer/'
       - '/data1/extranet/toolbox/.docker/config/npm/:/root/.npm/'
       - '/data1/extranet/toolbox/.docker/config/gitconfig:/root/.gitconfig'
+      - '/data1/extranet/toolbox/.docker/config/git/:/root/.config/git/'
+      - '/data1/extranet/toolbox/.docker/config/git/:/application/.config/git/'
+      - '/data1/extranet/toolbox/.docker/config/gitconfig:/application/.gitconfig'
       - '/data1/extranet/toolbox/.docker/config/monit/:/etc/monit/'
       - '/data1/extranet/toolbox/.docker/config/sudoers:/etc/sudoers.d/toolbox'
       - '/data1/extranet/toolbox/.docker/config/monit/id:/var/lib/monit/id'

diff --git a/app/Http/Controllers/Admin/Operations/Tools/GitReposCreate.php b/app/Http/Controllers/Admin/Operations/Tools/GitReposCreate.php
index ec9891b13b48e27d4e7d30b0920fab2230180ed5..458f82b7cbfd50a61bc036676945fb1c65983033 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/Tools/GitReposCreate.php
+++ b/app/Http/Controllers/Admin/Operations/Tools/GitReposCreate.php
@@ -3,7 +3,9 @@
 namespace App\Http\Controllers\Admin\Operations\Tools;
 
 use Cubist\Backpack\Magic\Form;
+use Cubist\Util\CommandLine\Git;
 use Cubist\Util\Text;
+use Illuminate\Support\Facades\Log;
 
 
 trait GitReposCreate
@@ -24,21 +26,22 @@ trait GitReposCreate
     public function dogitreposcreate()
     {
         $request = request();
-        $gitolite = storage_path('gitolite-admin');
+        $gitolite = protected_path('gitolite-admin');
+        $repos = Text::str2url($request->get('repos'));
+        $res = ['Add ' . $repos];
         if (!file_exists($gitolite) && !is_dir($gitolite)) {
-            $storage = storage_path();
-            `cd $storage;git clone git@git.cubedesigners.com:gitolite-admin.git`;
+            $storage = protected_path();
+            $res[] = Git::executeCommand($storage, 'clone git@git.cubedesigners.com:gitolite-admin.git');
         }
-        `cd $gitolite;git stash;git pull`;
-        $repos = Text::str2url($request->get('repos'));
+        $res = $res + Git::executeCommands($gitolite, ['stash', 'pull']);
+
         $projectsConf = $gitolite . '/conf/projects.conf';
         $projects = trim(file_get_contents($projectsConf));
         $projects .= "\n@allrepos = $repos\n";
         file_put_contents($projectsConf, $projects);
-        $projects;
-        `cd $gitolite;git commit -a -m "Added $repos from Toolbox"`;
-        `cd $gitolite;git push -u origin master`;
+        $res = array_merge($res, Git::executeCommands($gitolite, ['commit --author="Toolbox<toolbox@fluidbook.com>" -a -m "Added ' . $repos . ' from Toolbox"', 'push -u origin master']));
 
+        Log::debug(implode("\n", $res));
         return $this->_success(__('Le répertoire :repos a été crée', ['repos' => $repos]));
     }
 }

diff --git a/composer.lock b/composer.lock
index 636eac11b08c16b2cab5f3d1e35736ad8fbc2eb7..2d126071b536eec8f8bbaf5c0fd5dcbbbdc82f46 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1573,13 +1573,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git",
-                "reference": "6064f904a9a8f5c86eca5001f30efe961ef33b44"
+                "reference": "6d097dc3371a72c8a1f7e8d8468a48fa37b251ae"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-80c86b.tar",
-                "reference": "6064f904a9a8f5c86eca5001f30efe961ef33b44",
-                "shasum": "60a9249e20f5a89deea1fd6654aca0582ce13d55"
+                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-master-5b6b4f.tar",
+                "reference": "6d097dc3371a72c8a1f7e8d8468a48fa37b251ae",
+                "shasum": "7709496069b7f2536cb9b504a7ae4d4392a0cbeb"
             },
             "require": {
                 "cubist/cms-back": "dev-master"
@@ -1611,7 +1611,7 @@
                 }
             ],
             "description": "Cubedesigners common users database",
-            "time": "2022-08-10T16:45:35+00:00"
+            "time": "2022-09-06T13:10:36+00:00"
         },
         {
             "name": "cubist/azuretts",
@@ -1658,13 +1658,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "85df36ce91c653da39fc2370d53c69b5b036efea"
+                "reference": "6454134c2ba393af414015161e848f558c2ce6f4"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-cbd892.tar",
-                "reference": "85df36ce91c653da39fc2370d53c69b5b036efea",
-                "shasum": "eae454cb5cd26fd6959ee4927a8a25ca3dd79e1d"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-846d77.tar",
+                "reference": "6454134c2ba393af414015161e848f558c2ce6f4",
+                "shasum": "ed613a7053471ae71b5dc9099a62078b551aa802"
             },
             "require": {
                 "backpack/backupmanager": "^3.0",
@@ -1745,7 +1745,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2022-08-31T09:44:48+00:00"
+            "time": "2022-09-06T13:10:18+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -1955,16 +1955,18 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_locale.git",
-                "reference": "2d38aafdf39c770483f1638f0f5936a7e9beae81"
+                "reference": "02a7de778c0c2919005d71bb01c423e69e7f6885"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/locale/cubist-locale-dev-master-7c0deb.tar",
-                "reference": "2d38aafdf39c770483f1638f0f5936a7e9beae81",
-                "shasum": "3b8a9cd7ff893dc1ef48a90ce5dc0ab83dc2fa34"
+                "url": "https://composer.cubedesigners.com/dist/cubist/locale/cubist-locale-dev-master-6fc48d.tar",
+                "reference": "02a7de778c0c2919005d71bb01c423e69e7f6885",
+                "shasum": "897bd4a0ca586057a7b10322d9007fb8b693d69d"
             },
             "require": {
                 "barryvdh/laravel-debugbar": "*",
+                "cubist/util": "dev-master",
+                "laravel/framework": "~5.8|^6.0|^7.0|^8.0",
                 "php": ">=7.1.3",
                 "umpirsky/country-list": "^2.0",
                 "umpirsky/locale-list": "^1.0"
@@ -1995,7 +1997,7 @@
                 }
             ],
             "description": "Cubist Locale",
-            "time": "2022-04-12T10:03:49+00:00"
+            "time": "2022-09-01T16:15:28+00:00"
         },
         {
             "name": "cubist/matomo",
@@ -2165,13 +2167,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_util.git",
-                "reference": "0916c468e26b000455d6249869862840ec525742"
+                "reference": "7af79fc34fb7afaaca8b2de088c04172293f06f4"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-7a0ea7.tar",
-                "reference": "0916c468e26b000455d6249869862840ec525742",
-                "shasum": "c67af6bbb97469be05e8599b8dd3bf6fc87c0de6"
+                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-399a60.tar",
+                "reference": "7af79fc34fb7afaaca8b2de088c04172293f06f4",
+                "shasum": "395d3d25138aa3a3ab9473113de4a91f951f692d"
             },
             "require": {
                 "cubist/net": "dev-master",
@@ -2203,7 +2205,7 @@
                 }
             ],
             "description": "Utilities class",
-            "time": "2022-08-29T16:04:13+00:00"
+            "time": "2022-09-06T16:14:45+00:00"
         },
         {
             "name": "cviebrock/eloquent-sluggable",
@@ -2514,16 +2516,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.4.3",
+            "version": "3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "a24b89d663d8f261199bc0a91c48016042ebda85"
+                "reference": "4cbbe6e4b9ef6c69d5f4c968c637476f47bb54f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/a24b89d663d8f261199bc0a91c48016042ebda85",
-                "reference": "a24b89d663d8f261199bc0a91c48016042ebda85",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/4cbbe6e4b9ef6c69d5f4c968c637476f47bb54f5",
+                "reference": "4cbbe6e4b9ef6c69d5f4c968c637476f47bb54f5",
                 "shasum": ""
             },
             "require": {
@@ -2538,14 +2540,14 @@
             "require-dev": {
                 "doctrine/coding-standard": "10.0.0",
                 "jetbrains/phpstorm-stubs": "2022.2",
-                "phpstan/phpstan": "1.8.2",
+                "phpstan/phpstan": "1.8.3",
                 "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "9.5.21",
+                "phpunit/phpunit": "9.5.24",
                 "psalm/plugin-phpunit": "0.17.0",
                 "squizlabs/php_codesniffer": "3.7.1",
                 "symfony/cache": "^5.4|^6.0",
                 "symfony/console": "^4.4|^5.4|^6.0",
-                "vimeo/psalm": "4.24.0"
+                "vimeo/psalm": "4.27.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -2605,7 +2607,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.4.3"
+                "source": "https://github.com/doctrine/dbal/tree/3.4.4"
             },
             "funding": [
                 {
@@ -2621,7 +2623,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T17:26:36+00:00"
+            "time": "2022-09-01T21:26:42+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -3492,13 +3494,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/fluidbook_tools.git",
-                "reference": "48b6b104cedc5d6720adfc04956d3f2ceb787230"
+                "reference": "23b8f0063f12651a93f4f06ba67121a1fa4ece9b"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-9e79cb.tar",
-                "reference": "48b6b104cedc5d6720adfc04956d3f2ceb787230",
-                "shasum": "2b319b5661cf95f514e7a335a1756994e6bfe28e"
+                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-eae3a1.tar",
+                "reference": "23b8f0063f12651a93f4f06ba67121a1fa4ece9b",
+                "shasum": "3eed967218a8ef47a2fe14a99fd84ef1da81f878"
             },
             "require": {
                 "barryvdh/laravel-debugbar": "^3.6",
@@ -3532,7 +3534,7 @@
                 }
             ],
             "description": "Fluidbook Tools",
-            "time": "2022-08-31T09:49:48+00:00"
+            "time": "2022-08-31T10:45:30+00:00"
         },
         {
             "name": "genealabs/laravel-model-caching",
@@ -6271,16 +6273,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.62.0",
+            "version": "2.62.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "7507aec3d626797ce2123cf6c6556683be22b5f8"
+                "reference": "01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7507aec3d626797ce2123cf6c6556683be22b5f8",
-                "reference": "7507aec3d626797ce2123cf6c6556683be22b5f8",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a",
+                "reference": "01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a",
                 "shasum": ""
             },
             "require": {
@@ -6369,7 +6371,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T19:48:05+00:00"
+            "time": "2022-09-02T07:48:13+00:00"
         },
         {
             "name": "neutron/temporary-filesystem",
@@ -8230,16 +8232,16 @@
         },
         {
             "name": "spatie/db-dumper",
-            "version": "3.2.1",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/db-dumper.git",
-                "reference": "e90bdffb902b43c7d76dd45dd350a54f4330fee5"
+                "reference": "129b8254b2c9f10881a754a692bd9507b09a1893"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/db-dumper/zipball/e90bdffb902b43c7d76dd45dd350a54f4330fee5",
-                "reference": "e90bdffb902b43c7d76dd45dd350a54f4330fee5",
+                "url": "https://api.github.com/repos/spatie/db-dumper/zipball/129b8254b2c9f10881a754a692bd9507b09a1893",
+                "reference": "129b8254b2c9f10881a754a692bd9507b09a1893",
                 "shasum": ""
             },
             "require": {
@@ -8277,7 +8279,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/db-dumper/tree/3.2.1"
+                "source": "https://github.com/spatie/db-dumper/tree/3.3.0"
             },
             "funding": [
                 {
@@ -8289,7 +8291,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-06-15T13:27:17+00:00"
+            "time": "2022-09-01T20:20:26+00:00"
         },
         {
             "name": "spatie/image",
@@ -13269,16 +13271,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.14.0",
+            "version": "v4.15.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
                 "shasum": ""
             },
             "require": {
@@ -13319,9 +13321,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
             },
-            "time": "2022-05-31T20:59:12+00:00"
+            "time": "2022-09-04T07:30:47+00:00"
         },
         {
             "name": "nunomaduro/collision",

diff --git a/scripts/update b/scripts/update
index dc470a94b572959419339387759a7959238add19..6604470a208a84f64f6378d1437b0b520c35abab 100644 (file)
--- a/scripts/update
+++ b/scripts/update
@@ -15,5 +15,7 @@ php artisan cubist:magic:generate
 composer dump-autoload
 sudo /application/scripts/restartworkers
 /application/scripts/updatenpm
+sudo chown -R 1001:33 /application/storage/framework
 php artisan optimize:clear
 php artisan cubist:magic:precache
+sudo chown -R 1001:33 /application/storage/framework