From: Vincent Vanwaelscappel Date: Mon, 26 Aug 2024 15:55:22 +0000 (+0200) Subject: wait #7051 @2 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7b3d57d8275ef694603d53906b9bc64c1bb7d4f1;p=fluidbook-toolbox.git wait #7051 @2 --- diff --git a/app/Fluidbook/Link/Custom/WescoLink.php b/app/Fluidbook/Link/Custom/WescoLink.php index d2e28248b..a5b965e76 100644 --- a/app/Fluidbook/Link/Custom/WescoLink.php +++ b/app/Fluidbook/Link/Custom/WescoLink.php @@ -6,7 +6,7 @@ use Fluidbook\Tools\Links\CustomLink; class WescoLink extends CustomLink { - public static function _getURL($to) + public static function _getURL($to,$type='',$default=null) { return self::_getURLOfType($to,'wesco'); } diff --git a/app/Models/ToolWebflow.php b/app/Models/ToolWebflow.php index 69f8102ba..909539d4c 100644 --- a/app/Models/ToolWebflow.php +++ b/app/Models/ToolWebflow.php @@ -379,7 +379,6 @@ class ToolWebflow extends ToolboxTranslatableModel $wget->setArg(null, 'https://' . $this->webflow . '.webflow.io'); $wget->execute(); - $path = $this->getMirrorPath(); Files::rmdir($path); `mv $tmp $path`; @@ -452,7 +451,7 @@ class ToolWebflow extends ToolboxTranslatableModel foreach (Files::getRecursiveDirectoryIterator($mirror) as $f) { /** @var $f \SplFileInfo */ - if ($f->isDir() || $f->getExtension() !== 'html') { + if ($f->isDir() || $f->getExtension() !== 'html' || stristr($f->getPathname(), 'webflow_mirror')) { continue; } $relative = '/' . str_replace($mirror, '', $f->getPathname()); @@ -533,10 +532,10 @@ class ToolWebflow extends ToolboxTranslatableModel // Texts foreach ($texts as $text => $translation) { - $pattern = '/>(\s*)(' . addcslashes($text, './()[]{}') . ')(\s*)${1}' . $translation . '${3}<', $html); + $html = str_replace('>' . $text . '<', '>' . $translation . '<', $html); + $html = str_replace('>' . $text . ' <', '>' . $translation . ' <', $html); } + // Images diff --git a/app/Services/Webflow.php b/app/Services/Webflow.php index 15c57f80b..0d2e08e6f 100644 --- a/app/Services/Webflow.php +++ b/app/Services/Webflow.php @@ -263,7 +263,6 @@ class Webflow $data = self::getAllData($shortname); - $res = ['texts' => [], 'images' => [], 'seo' => []]; foreach ($data['pages'] as $pageID => $page) { $details = $page['details']; @@ -309,7 +308,6 @@ class Webflow $res['seo'][$pageID] = $seo; - foreach ($page['contents'] as $node) { if ($node['type'] === 'text') { if (!$node['text']['text'] || !$node['text']['html']) { @@ -319,7 +317,6 @@ class Webflow $html = str_replace('
', "\n", $html); $texts = Html::getTextNodes($html); self::addTexts($texts, $res['texts']); - } else if ($node['type'] === 'image') { if (!isset($node['image']['assetId'])) { diff --git a/app/SubForms/Webflow/SEOPage.php b/app/SubForms/Webflow/SEOPage.php index 67ecfd527..fa6f36bd9 100644 --- a/app/SubForms/Webflow/SEOPage.php +++ b/app/SubForms/Webflow/SEOPage.php @@ -18,7 +18,7 @@ class SEOPage extends SubForm $this->addField('url', HiddenVisible::class, __('URL')); $this->addField('type', HiddenVisible::class, __('Type')); $this->addField('draft', Checkbox::class, __('Brouillon'), ['when' => ['type' => ['operator' => 'not', 'value' => 'page_html']]]); - $this->addField('slug', Text::class, __('Slug') . ' (' . __('slug') . ')', ['when' => ['url' => ['operator' => '!', 'value' => '/index.html']]]); + $this->addField('slug', Text::class, __('Slug') . ' (' . __('slug') . ')', ['when' => ['type' => 'page', 'url' => ['operator' => '!', 'value' => '/index.html']]]); $this->addField('seo_title', Text::class, __('Titre'), ['when' => ['type' => ['page', 'page_html']]]); $this->addField('og_title_copied', Checkbox::class, __('Utiliser le titre ci-dessus pour les réseaux sociaux'), ['when' => ['type' => ['page_html', 'page']]]); $this->addField('og_title', Text::class, __('Titre pour les réseaux sociaux'), ['when' => ['og_title_copied' => '0', 'type' => ['page_html', 'page']]]); diff --git a/composer.json b/composer.json index 6de57016c..0469e47d8 100644 --- a/composer.json +++ b/composer.json @@ -34,8 +34,8 @@ "ext-zip": "*", "ext-zlib": "*", "cubedesigners/userdatabase": "dev-master", - "cubist/azuretts": "dev-master", "cubist/azuretranslate": "dev-master", + "cubist/azuretts": "dev-master", "cubist/cms-back": "dev-master", "cubist/excel": "dev-master", "cubist/matomo": "dev-master", @@ -44,18 +44,21 @@ "egulias/email-validator": "^4.0", "fluidbook/tools": "dev-master", "hollodotme/fast-cgi-client": "^3.1.7", + "ilab/standalone-blade": "dev-main", "jolicode/slack-php-api": "^v4.7.0", "jsvrcek/ics": "^0.8.5", "laravel-notification-channels/webpush": "^7.1", "league/csv": "^9.16.0", "mailjet/mailjet-apiv3-php": "^1.6", "mxl/laravel-job": "^v1.6.0", - "nyholm/psr7": "^1.8.0", + "nyholm/psr7": "^1.8", "php-ffmpeg/php-ffmpeg": "^v1.2.0", + "php-http/curl-client": "^2.3", + "php-http/message": "^1.16", + "pnz/mattermost-client": "2.x-dev", "rickselby/laravel-gate-cache": "^3.7", "rodneyrehm/plist": "^2.0", "rustici-software/scormcloud-api-v2-client-php": "^2.1.0", - "ilab/standalone-blade": "dev-main", "simplesoftwareio/simple-qrcode": "^4.2", "symfony/http-client": "^v6.4.0", "voku/simple_html_dom": "^4.8" diff --git a/composer.lock b/composer.lock index 6bbaf5057..fdfa546e1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "399386c7990710740fdcd97087cf9241", + "content-hash": "534e3e6f2014dd23ae4c7ad3f482c968", "packages": [ { "name": "archtechx/enums", @@ -1029,12 +1029,12 @@ "source": { "type": "git", "url": "https://github.com/chillerlan/php-qrcode.git", - "reference": "7e7552bc0535af3bb50036ab258fc9dd5ab40a62" + "reference": "034b3a383f16dab846b89913c9cd91433add3277" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/7e7552bc0535af3bb50036ab258fc9dd5ab40a62", - "reference": "7e7552bc0535af3bb50036ab258fc9dd5ab40a62", + "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/034b3a383f16dab846b89913c9cd91433add3277", + "reference": "034b3a383f16dab846b89913c9cd91433add3277", "shasum": "" }, "require": { @@ -1118,7 +1118,7 @@ "type": "Ko-Fi" } ], - "time": "2024-07-23T12:50:23+00:00" + "time": "2024-08-25T12:29:40+00:00" }, { "name": "chillerlan/php-settings-container", @@ -2115,13 +2115,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_net.git", - "reference": "af447f3c4f2fdca8977e2122d6cd91a83e1de3a3" + "reference": "8d72260fe076601aa0e931af00b5817c4a90841e" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-18694c.tar", - "reference": "af447f3c4f2fdca8977e2122d6cd91a83e1de3a3", - "shasum": "4557b76583e79c32a9f1a175b613d910f900b046" + "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-c5f47b.tar", + "reference": "8d72260fe076601aa0e931af00b5817c4a90841e", + "shasum": "7407f73f68a5dd929fb3cf15a7f223d405a59545" }, "require": { "cubist/util": "dev-master", @@ -2146,7 +2146,7 @@ } ], "description": "net cubist composer package", - "time": "2024-07-30T12:07:46+00:00" + "time": "2024-07-30T13:32:45+00:00" }, { "name": "cubist/pdf", @@ -2241,13 +2241,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "2aec132b49e4fd3905249cf25fa62f9c48624e2a" + "reference": "5c932b5d0d2b648e09b029ec41172ebe3074fc52" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-85478e.tar", - "reference": "2aec132b49e4fd3905249cf25fa62f9c48624e2a", - "shasum": "150c8d2942bc8aa4b7a39402ff446f2472d7e1b4" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-a98892.tar", + "reference": "5c932b5d0d2b648e09b029ec41172ebe3074fc52", + "shasum": "d348bd1b4c65d69de1941f5c0442dcce7f259487" }, "require": { "cubist/net": "dev-master", @@ -2281,7 +2281,7 @@ } ], "description": "Utilities class", - "time": "2024-07-30T12:42:28+00:00" + "time": "2024-08-21T15:48:28+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -2435,23 +2435,23 @@ }, { "name": "dasprid/enum", - "version": "1.0.5", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/DASPRiD/Enum.git", - "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016" + "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016", - "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016", + "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90", + "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90", "shasum": "" }, "require": { "php": ">=7.1 <9.0" }, "require-dev": { - "phpunit/phpunit": "^7 | ^8 | ^9", + "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11", "squizlabs/php_codesniffer": "*" }, "type": "library", @@ -2479,9 +2479,9 @@ ], "support": { "issues": "https://github.com/DASPRiD/Enum/issues", - "source": "https://github.com/DASPRiD/Enum/tree/1.0.5" + "source": "https://github.com/DASPRiD/Enum/tree/1.0.6" }, - "time": "2023-08-25T16:18:39+00:00" + "time": "2024-08-09T14:30:48+00:00" }, { "name": "dflydev/dot-access-data", @@ -2772,16 +2772,16 @@ }, { "name": "doctrine/dbal", - "version": "3.8.6", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "b7411825cf7efb7e51f9791dea19d86e43b399a1" + "reference": "d8f68ea6cc00912e5313237130b8c8decf4d28c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/b7411825cf7efb7e51f9791dea19d86e43b399a1", - "reference": "b7411825cf7efb7e51f9791dea19d86e43b399a1", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/d8f68ea6cc00912e5313237130b8c8decf4d28c6", + "reference": "d8f68ea6cc00912e5313237130b8c8decf4d28c6", "shasum": "" }, "require": { @@ -2797,12 +2797,12 @@ "doctrine/coding-standard": "12.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "1.11.5", + "phpstan/phpstan": "1.11.7", "phpstan/phpstan-strict-rules": "^1.6", - "phpunit/phpunit": "9.6.19", + "phpunit/phpunit": "9.6.20", "psalm/plugin-phpunit": "0.18.4", "slevomat/coding-standard": "8.13.1", - "squizlabs/php_codesniffer": "3.10.1", + "squizlabs/php_codesniffer": "3.10.2", "symfony/cache": "^5.4|^6.0|^7.0", "symfony/console": "^4.4|^5.4|^6.0|^7.0", "vimeo/psalm": "4.30.0" @@ -2865,7 +2865,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.8.6" + "source": "https://github.com/doctrine/dbal/tree/3.9.0" }, "funding": [ { @@ -2881,7 +2881,7 @@ "type": "tidelift" } ], - "time": "2024-06-19T10:38:17+00:00" + "time": "2024-08-15T07:34:42+00:00" }, { "name": "doctrine/deprecations", @@ -3889,13 +3889,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/fluidbook_tools.git", - "reference": "44485d80e97f8fbf4f2de00250f56c7d6a47065c" + "reference": "69cc53f0608c9001343f6903da7b6fefed8f4b92" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-85ffbf.tar", - "reference": "44485d80e97f8fbf4f2de00250f56c7d6a47065c", - "shasum": "e26626a87c8ee039d18a98d26ad388c7d9b38731" + "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-04a0b4.tar", + "reference": "69cc53f0608c9001343f6903da7b6fefed8f4b92", + "shasum": "f12ad27474ba234203909158dcedef1a808a8202" }, "require": { "barryvdh/laravel-debugbar": "*", @@ -3931,7 +3931,7 @@ } ], "description": "Fluidbook Tools", - "time": "2024-07-19T17:32:36+00:00" + "time": "2024-08-22T10:19:18+00:00" }, { "name": "fruitcake/php-cors", @@ -5238,16 +5238,16 @@ }, { "name": "laravel/framework", - "version": "v10.48.17", + "version": "v10.48.20", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "60f3c8f667b24a09e0392e26b1f40fb9067cdc3c" + "reference": "be2be342d4c74db6a8d2bd18469cd6d488ab9c98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/60f3c8f667b24a09e0392e26b1f40fb9067cdc3c", - "reference": "60f3c8f667b24a09e0392e26b1f40fb9067cdc3c", + "url": "https://api.github.com/repos/laravel/framework/zipball/be2be342d4c74db6a8d2bd18469cd6d488ab9c98", + "reference": "be2be342d4c74db6a8d2bd18469cd6d488ab9c98", "shasum": "" }, "require": { @@ -5441,20 +5441,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-07-23T16:06:06+00:00" + "time": "2024-08-09T07:55:45+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.24", + "version": "v0.1.25", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "409b0b4305273472f3754826e68f4edbd0150149" + "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149", - "reference": "409b0b4305273472f3754826e68f4edbd0150149", + "url": "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95", + "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95", "shasum": "" }, "require": { @@ -5497,32 +5497,33 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.24" + "source": "https://github.com/laravel/prompts/tree/v0.1.25" }, - "time": "2024-06-17T13:58:22+00:00" + "time": "2024-08-12T22:06:33+00:00" }, { "name": "laravel/serializable-closure", - "version": "v1.3.3", + "version": "v1.3.4", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "3dbf8a8e914634c48d389c1234552666b3d43754" + "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754", - "reference": "3dbf8a8e914634c48d389c1234552666b3d43754", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81", + "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81", "shasum": "" }, "require": { "php": "^7.3|^8.0" }, "require-dev": { - "nesbot/carbon": "^2.61", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", + "nesbot/carbon": "^2.61|^3.0", "pestphp/pest": "^1.21.3", "phpstan/phpstan": "^1.8.2", - "symfony/var-dumper": "^5.4.11" + "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0" }, "type": "library", "extra": { @@ -5559,7 +5560,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2023-11-08T14:08:06+00:00" + "time": "2024-08-02T07:48:17+00:00" }, { "name": "lavary/laravel-menu", @@ -5619,16 +5620,16 @@ }, { "name": "league/commonmark", - "version": "2.5.1", + "version": "2.5.3", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c" + "reference": "b650144166dfa7703e62a22e493b853b58d874b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/ac815920de0eff6de947eac0a6a94e5ed0fb147c", - "reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0", + "reference": "b650144166dfa7703e62a22e493b853b58d874b0", "shasum": "" }, "require": { @@ -5641,8 +5642,8 @@ }, "require-dev": { "cebe/markdown": "^1.0", - "commonmark/cmark": "0.31.0", - "commonmark/commonmark.js": "0.31.0", + "commonmark/cmark": "0.31.1", + "commonmark/commonmark.js": "0.31.1", "composer/package-versions-deprecated": "^1.8", "embed/embed": "^4.4", "erusev/parsedown": "^1.0", @@ -5721,7 +5722,7 @@ "type": "tidelift" } ], - "time": "2024-07-24T12:52:09+00:00" + "time": "2024-08-16T11:46:16+00:00" }, { "name": "league/config", @@ -7113,20 +7114,20 @@ }, { "name": "nette/utils", - "version": "v4.0.4", + "version": "v4.0.5", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218" + "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218", - "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218", + "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96", + "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96", "shasum": "" }, "require": { - "php": ">=8.0 <8.4" + "php": "8.0 - 8.4" }, "conflict": { "nette/finder": "<3", @@ -7193,9 +7194,9 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.0.4" + "source": "https://github.com/nette/utils/tree/v4.0.5" }, - "time": "2024-01-17T16:50:36+00:00" + "time": "2024-08-07T15:39:19+00:00" }, { "name": "norkunas/youtube-dl-php", @@ -7261,16 +7262,16 @@ }, { "name": "nothingworks/blade-svg", - "version": "1.7.0", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/blade-ui-kit/blade-icons.git", - "reference": "74275f44c71e815b85bf7cea66e3bf98c57fb7e4" + "reference": "8f787baf09d88cdfd6ec4dbaba11ebfa885f0595" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/blade-ui-kit/blade-icons/zipball/74275f44c71e815b85bf7cea66e3bf98c57fb7e4", - "reference": "74275f44c71e815b85bf7cea66e3bf98c57fb7e4", + "url": "https://api.github.com/repos/blade-ui-kit/blade-icons/zipball/8f787baf09d88cdfd6ec4dbaba11ebfa885f0595", + "reference": "8f787baf09d88cdfd6ec4dbaba11ebfa885f0595", "shasum": "" }, "require": { @@ -7339,7 +7340,7 @@ } ], "abandoned": "blade-ui-kit/blade-icons", - "time": "2024-07-29T21:49:30+00:00" + "time": "2024-08-14T14:25:11+00:00" }, { "name": "nunomaduro/termwind", @@ -7866,6 +7867,71 @@ }, "time": "2023-11-30T10:31:25+00:00" }, + { + "name": "php-http/curl-client", + "version": "2.3.2", + "source": { + "type": "git", + "url": "https://github.com/php-http/curl-client.git", + "reference": "0b869922458b1cde9137374545ed4fff7ac83623" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/0b869922458b1cde9137374545ed4fff7ac83623", + "reference": "0b869922458b1cde9137374545ed4fff7ac83623", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": "^7.4 || ^8.0", + "php-http/discovery": "^1.6", + "php-http/httplug": "^2.0", + "php-http/message": "^1.2", + "psr/http-client": "^1.0", + "psr/http-factory-implementation": "^1.0", + "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "guzzlehttp/psr7": "^2.0", + "laminas/laminas-diactoros": "^2.0", + "php-http/client-integration-tests": "^3.0", + "php-http/message-factory": "^1.1", + "phpunit/phpunit": "^7.5 || ^9.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Http\\Client\\Curl\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Михаил Красильников", + "email": "m.krasilnikov@yandex.ru" + } + ], + "description": "PSR-18 and HTTPlug Async client with cURL", + "homepage": "http://php-http.org", + "keywords": [ + "curl", + "http", + "psr-18" + ], + "support": { + "issues": "https://github.com/php-http/curl-client/issues", + "source": "https://github.com/php-http/curl-client/tree/2.3.2" + }, + "time": "2024-03-03T08:21:07+00:00" + }, { "name": "php-http/discovery", "version": "1.19.4", @@ -8415,6 +8481,70 @@ ], "time": "2024-07-20T21:41:07+00:00" }, + { + "name": "pnz/mattermost-client", + "version": "2.x-dev", + "source": { + "type": "git", + "url": "https://github.com/thePanz/MattermostClient.git", + "reference": "74c14f78bce005131da44d293d45cbd04aaedb3d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thePanz/MattermostClient/zipball/74c14f78bce005131da44d293d45cbd04aaedb3d", + "reference": "74c14f78bce005131da44d293d45cbd04aaedb3d", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^8.1", + "php-http/client-common": "^2.0", + "php-http/discovery": "^1.17", + "php-http/httplug": "^2.1", + "php-http/multipart-stream-builder": "^1.1", + "psr/http-client-implementation": "*", + "psr/http-factory-implementation": "*", + "psr/http-message": "^1.0" + }, + "require-dev": { + "nyholm/psr7": "^1.8", + "php-cs-fixer/shim": "^v3.34", + "php-http/curl-client": "^2.3", + "php-http/mock-client": "^1.6", + "phpstan/extension-installer": "^1.3", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^10.5", + "rector/rector": "^0.18.12" + }, + "type": "library", + "autoload": { + "psr-4": { + "Pnz\\MattermostClient\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Emanuele Panzeri - ThePanz", + "email": "thepaz@gmail.com", + "role": "Developer" + } + ], + "description": "Mattermost APi Client for PHP", + "keywords": [ + "Mattermost", + "api" + ], + "support": { + "issues": "https://github.com/thePanz/MattermostClient/issues", + "source": "https://github.com/thePanz/MattermostClient/tree/2.x" + }, + "time": "2023-12-20T14:23:35+00:00" + }, { "name": "prologue/alerts", "version": "1.2.0", @@ -8846,16 +8976,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "79dff0b268932c640297f5208d6298f71855c03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", + "reference": "79dff0b268932c640297f5208d6298f71855c03e", "shasum": "" }, "require": { @@ -8890,9 +9020,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.1" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-08-21T13:31:24+00:00" }, { "name": "psr/simple-cache", @@ -9672,16 +9802,16 @@ }, { "name": "spatie/laravel-backup", - "version": "8.8.1", + "version": "8.8.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "a9c2d2f726f4c60c2dc5d7c0c8380f72492638c2" + "reference": "5b672713283703a74c629ccd67b1d77eb57e24b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/a9c2d2f726f4c60c2dc5d7c0c8380f72492638c2", - "reference": "a9c2d2f726f4c60c2dc5d7c0c8380f72492638c2", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/5b672713283703a74c629ccd67b1d77eb57e24b9", + "reference": "5b672713283703a74c629ccd67b1d77eb57e24b9", "shasum": "" }, "require": { @@ -9755,7 +9885,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-backup/issues", - "source": "https://github.com/spatie/laravel-backup/tree/8.8.1" + "source": "https://github.com/spatie/laravel-backup/tree/8.8.2" }, "funding": [ { @@ -9767,7 +9897,7 @@ "type": "other" } ], - "time": "2024-06-04T11:31:33+00:00" + "time": "2024-08-07T11:07:52+00:00" }, { "name": "spatie/laravel-googletagmanager", @@ -10618,16 +10748,16 @@ }, { "name": "swayok/alternative-laravel-cache", - "version": "6.1.15", + "version": "6.1.16", "source": { "type": "git", "url": "https://github.com/swayok/alternative-laravel-cache.git", - "reference": "ce462b3dda9a7312fabfd40e20973d18e79772a9" + "reference": "4916c0817e06481df04b278db5168da449a2e7e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swayok/alternative-laravel-cache/zipball/ce462b3dda9a7312fabfd40e20973d18e79772a9", - "reference": "ce462b3dda9a7312fabfd40e20973d18e79772a9", + "url": "https://api.github.com/repos/swayok/alternative-laravel-cache/zipball/4916c0817e06481df04b278db5168da449a2e7e1", + "reference": "4916c0817e06481df04b278db5168da449a2e7e1", "shasum": "" }, "require": { @@ -10682,9 +10812,9 @@ ], "support": { "issues": "https://github.com/swayok/alternative-laravel-cache/issues", - "source": "https://github.com/swayok/alternative-laravel-cache/tree/6.1.15" + "source": "https://github.com/swayok/alternative-laravel-cache/tree/6.1.16" }, - "time": "2024-03-12T19:43:01+00:00" + "time": "2024-08-25T12:58:34+00:00" }, { "name": "symfony/cache", @@ -14900,26 +15030,26 @@ }, { "name": "composer/pcre", - "version": "3.2.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90" + "reference": "1637e067347a0c40bbb1e3cd786b20dcab556a81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90", - "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90", + "url": "https://api.github.com/repos/composer/pcre/zipball/1637e067347a0c40bbb1e3cd786b20dcab556a81", + "reference": "1637e067347a0c40bbb1e3cd786b20dcab556a81", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, "conflict": { - "phpstan/phpstan": "<1.11.8" + "phpstan/phpstan": "<1.11.10" }, "require-dev": { - "phpstan/phpstan": "^1.11.8", + "phpstan/phpstan": "^1.11.10", "phpstan/phpstan-strict-rules": "^1.1", "phpunit/phpunit": "^8 || ^9" }, @@ -14959,7 +15089,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.2.0" + "source": "https://github.com/composer/pcre/tree/3.3.0" }, "funding": [ { @@ -14975,7 +15105,7 @@ "type": "tidelift" } ], - "time": "2024-07-25T09:36:02+00:00" + "time": "2024-08-19T19:43:53+00:00" }, { "name": "doctrine/instantiator", @@ -15802,35 +15932,35 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.31", + "version": "9.2.32", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", - "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", + "nikic/php-parser": "^4.19.1 || ^5.1.0", "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -15839,7 +15969,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "9.2.x-dev" } }, "autoload": { @@ -15868,7 +15998,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" }, "funding": [ { @@ -15876,7 +16006,7 @@ "type": "github" } ], - "time": "2024-03-02T06:37:42+00:00" + "time": "2024-08-22T04:23:01+00:00" }, { "name": "phpunit/php-file-iterator", @@ -17403,16 +17533,16 @@ }, { "name": "spatie/flare-client-php", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/spatie/flare-client-php.git", - "reference": "097040ff51e660e0f6fc863684ac4b02c93fa234" + "reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/097040ff51e660e0f6fc863684ac4b02c93fa234", - "reference": "097040ff51e660e0f6fc863684ac4b02c93fa234", + "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122", + "reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122", "shasum": "" }, "require": { @@ -17430,7 +17560,7 @@ "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", - "spatie/phpunit-snapshot-assertions": "^4.0|^5.0" + "spatie/pest-plugin-snapshots": "^1.0|^2.0" }, "type": "library", "extra": { @@ -17460,7 +17590,7 @@ ], "support": { "issues": "https://github.com/spatie/flare-client-php/issues", - "source": "https://github.com/spatie/flare-client-php/tree/1.7.0" + "source": "https://github.com/spatie/flare-client-php/tree/1.8.0" }, "funding": [ { @@ -17468,7 +17598,7 @@ "type": "github" } ], - "time": "2024-06-12T14:39:14+00:00" + "time": "2024-08-01T08:27:26+00:00" }, { "name": "spatie/ignition", @@ -17699,15 +17829,16 @@ "minimum-stability": "dev", "stability-flags": { "cubedesigners/userdatabase": 20, - "cubist/azuretts": 20, "cubist/azuretranslate": 20, + "cubist/azuretts": 20, "cubist/cms-back": 20, "cubist/excel": 20, "cubist/matomo": 20, "cubist/pdf": 20, "cubist/scorm": 20, "fluidbook/tools": 20, - "ilab/standalone-blade": 20 + "ilab/standalone-blade": 20, + "pnz/mattermost-client": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/scripts/fixrights.sh b/scripts/fixrights.sh index 1d228909b..05d54da6d 100644 --- a/scripts/fixrights.sh +++ b/scripts/fixrights.sh @@ -1,7 +1,7 @@ #!/bin/sh -find /home/toolbox/www/ -type d -prune -o -exec chown -R toolbox:www-data {} \; -find /data/toolbox/protected/ -type d -prune -o -exec chown -R toolbox:www-data {} \; +chown -R toolbox:www-data /home/toolbox/www/ +chown -R toolbox:www-data /data/toolbox/protected/ chown root:root /home/toolbox/www/.docker/config/sudoers chown root:root /home/toolbox/www/.docker/config/cron/host chmod -R 755 /home/toolbox/www/scripts @@ -11,7 +11,7 @@ chmod -R 775 /home/toolbox/www/public chmod -R 775 /home/toolbox/www/bin -find /home/toolbox/dev/ -type d -prune -o -exec chown -R toolbox:www-data {} \; +chown -R toolbox:www-data /home/toolbox/dev/ chown root:root /home/toolbox/dev/.docker/config/sudoers chown root:root /home/toolbox/dev/.docker/config/cron/host chmod -R 775 /home/toolbox/dev/scripts @@ -19,7 +19,7 @@ chmod -R 775 /home/toolbox/dev/protected chmod -R 775 /home/toolbox/dev/public chmod -R 775 /home/toolbox/dev/bin -find /data/toolbox/alpha/ -type d -prune -o -exec chown -R toolbox:www-data {} \; +chown -R toolbox:www-data /home/toolbox/alpha/ chown root:root /data/toolbox/alpha/.docker/config/sudoers chown root:root /data/toolbox/alpha/.docker/config/cron/host chmod -R 775 /data/toolbox/alpha/scripts