mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

[BS5] Replaced Composer Dependency

Browse Source
This commit is contained in:
Lucas Bartholemy 2024-05-25 15:14:54 +02:00
parent 873d856fca
commit 13dc027147
5 changed files with 94 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -77,7 +77,7 @@
"xj/yii2-jplayer-widget": "^2.7",
"yiisoft/yii2": "dev-master",
"yiisoft/yii2-authclient": "^2.2.0",
"yiisoft/yii2-bootstrap": "^2.0.0",
"yiisoft/yii2-bootstrap5": "^2.0",
"yiisoft/yii2-httpclient": "^2.0.0",
"yiisoft/yii2-imagine": "^2.3.0",
"yiisoft/yii2-jui": "^2.0.0",

177
composer.lock generated
View File

@ -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": "1999d0a4f117ac2c69cf9743553d7b08",
"content-hash": "dfa130d40db771038aac0da1101e48db",
"packages": [
{
"name": "async-aws/core",
@ -133,24 +133,18 @@
},
{
"name": "bower-asset/bootstrap",
"version": "v3.4.1",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "git@github.com:twbs/bootstrap.git",
"reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
"url": "https://github.com/twbs/bootstrap.git",
"reference": "6e1f75f420f68e1d52733b8e407fc7c3766c9dba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/68b0d231a13201eb14acd3dc84e51543d16e5f7e",
"reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/6e1f75f420f68e1d52733b8e407fc7c3766c9dba",
"reference": "6e1f75f420f68e1d52733b8e407fc7c3766c9dba"
},
"require": {
"bower-asset/jquery": ">=1.9.1,<4.0"
},
"type": "bower-asset",
"license": [
"MIT"
]
"type": "bower-asset"
},
{
"name": "bower-asset/inputmask",
@ -856,26 +850,26 @@
},
{
"name": "firebase/php-jwt",
"version": "v6.10.0",
"version": "v6.10.1",
"source": {
"type": "git",
"url": "https://github.com/firebase/php-jwt.git",
"reference": "a49db6f0a5033aef5143295342f1c95521b075ff"
"reference": "500501c2ce893c824c801da135d02661199f60c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff",
"reference": "a49db6f0a5033aef5143295342f1c95521b075ff",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5",
"reference": "500501c2ce893c824c801da135d02661199f60c5",
"shasum": ""
},
"require": {
"php": "^7.4||^8.0"
"php": "^8.0"
},
"require-dev": {
"guzzlehttp/guzzle": "^6.5||^7.4",
"guzzlehttp/guzzle": "^7.4",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
"psr/cache": "^1.0||^2.0",
"psr/cache": "^2.0||^3.0",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0"
},
@ -913,9 +907,9 @@
],
"support": {
"issues": "https://github.com/firebase/php-jwt/issues",
"source": "https://github.com/firebase/php-jwt/tree/v6.10.0"
"source": "https://github.com/firebase/php-jwt/tree/v6.10.1"
},
"time": "2023-12-01T16:26:39+00:00"
"time": "2024-05-18T18:05:11+00:00"
},
{
"name": "imagine/imagine",
@ -8962,12 +8956,12 @@
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-framework.git",
"reference": "12e57a9bb38c1deebb497519825e7093e5058b63"
"reference": "4dc179466e89eaf6a834638d82b4af215b064c7c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/12e57a9bb38c1deebb497519825e7093e5058b63",
"reference": "12e57a9bb38c1deebb497519825e7093e5058b63",
"url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/4dc179466e89eaf6a834638d82b4af215b064c7c",
"reference": "4dc179466e89eaf6a834638d82b4af215b064c7c",
"shasum": ""
},
"require": {
@ -9077,7 +9071,7 @@
"type": "tidelift"
}
],
"time": "2024-04-13T22:36:29+00:00"
"time": "2024-05-18T20:54:18+00:00"
},
{
"name": "yiisoft/yii2-authclient",
@ -9173,45 +9167,43 @@
"time": "2024-05-10T11:16:16+00:00"
},
{
"name": "yiisoft/yii2-bootstrap",
"version": "2.0.11",
"name": "yiisoft/yii2-bootstrap5",
"version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-bootstrap.git",
"reference": "83d144f4089adaa7064ad60dc4c1436daa2eb30e"
"url": "https://github.com/yiisoft/yii2-bootstrap5.git",
"reference": "0ce35f80ca07763fa2c6f38d1c0a1aaf65c76d2e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/83d144f4089adaa7064ad60dc4c1436daa2eb30e",
"reference": "83d144f4089adaa7064ad60dc4c1436daa2eb30e",
"url": "https://api.github.com/repos/yiisoft/yii2-bootstrap5/zipball/0ce35f80ca07763fa2c6f38d1c0a1aaf65c76d2e",
"reference": "0ce35f80ca07763fa2c6f38d1c0a1aaf65c76d2e",
"shasum": ""
},
"require": {
"bower-asset/bootstrap": "3.4.* | 3.3.* | 3.2.* | 3.1.*",
"yiisoft/yii2": "~2.0.6"
"bower-asset/bootstrap": "^5.1.0",
"ext-json": "*",
"php": ">=7.0",
"yiisoft/yii2": "^2.0.42"
},
"require-dev": {
"cweagans/composer-patches": "^1.7",
"phpunit/phpunit": "4.8.34"
"phpunit/phpunit": "^6.5.14",
"twbs/bootstrap-icons": "^1.7.2",
"yiisoft/yii2-coding-standards": "~2.0"
},
"suggest": {
"twbs/bootstrap-icons": "Add this package to the `require` section of your `composer.json` if you'd like to use the bootstrap icon asset."
},
"type": "yii2-extension",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
},
"patches": {
"phpunit/phpunit-mock-objects": {
"Fix PHP 7 and 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_mock_objects.patch"
},
"phpunit/phpunit": {
"Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch",
"Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch"
}
}
"bootstrap": "yii\\bootstrap5\\i18n\\TranslationBootstrap"
},
"autoload": {
"psr-4": {
"yii\\bootstrap\\": "src"
"yii\\bootstrap5\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -9220,35 +9212,24 @@
],
"authors": [
{
"name": "Qiang Xue",
"email": "qiang.xue@gmail.com",
"homepage": "http://www.yiiframework.com/"
"name": "Sergey Zhukovskiy",
"email": "mylistryx@gmail.com",
"homepage": "https://net23.ru/"
},
{
"name": "Alexander Makarov",
"email": "sam@rmcreative.ru",
"homepage": "http://rmcreative.ru/"
},
{
"name": "Antonio Ramirez",
"email": "amigo.cobos@gmail.com"
},
{
"name": "Paul Klimov",
"email": "klimov.paul@gmail.com"
"name": "Simon Karlen",
"email": "simi.albi@outlook.com"
}
],
"description": "The Twitter Bootstrap extension for the Yii framework",
"description": "The Twitter Bootstrap v5 extension for the Yii framework",
"keywords": [
"bootstrap",
"bootstrap5",
"yii2"
],
"support": {
"forum": "http://www.yiiframework.com/forum/",
"irc": "irc://irc.freenode.net/yii",
"issues": "https://github.com/yiisoft/yii2-bootstrap/issues",
"source": "https://github.com/yiisoft/yii2-bootstrap",
"wiki": "http://www.yiiframework.com/wiki/"
"issues": "https://github.com/yiisoft/yii2-bootstrap5/issues",
"source": "https://github.com/yiisoft/yii2-bootstrap5"
},
"funding": [
{
@ -9260,11 +9241,11 @@
"type": "open_collective"
},
{
"url": "https://tidelift.com/funding/github/packagist/yiisoft/yii2-bootstrap",
"url": "https://tidelift.com/funding/github/packagist/yiisoft/yii2-bootstrap5",
"type": "tidelift"
}
],
"time": "2021-08-09T20:54:06+00:00"
"time": "2022-11-30T08:25:21+00:00"
},
{
"name": "yiisoft/yii2-composer",
@ -10934,16 +10915,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.57.1",
"version": "v3.57.2",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "3f7efe667a8c9818aacceee478add7c0fc24cb21"
"reference": "22f7f3145606df92b02fb1bd22c30abfce956d3c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3f7efe667a8c9818aacceee478add7c0fc24cb21",
"reference": "3f7efe667a8c9818aacceee478add7c0fc24cb21",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/22f7f3145606df92b02fb1bd22c30abfce956d3c",
"reference": "22f7f3145606df92b02fb1bd22c30abfce956d3c",
"shasum": ""
},
"require": {
@ -11022,7 +11003,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.57.1"
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.57.2"
},
"funding": [
{
@ -11030,7 +11011,7 @@
"type": "github"
}
],
"time": "2024-05-15T22:01:07+00:00"
"time": "2024-05-20T20:41:57+00:00"
},
{
"name": "guzzlehttp/psr7",
@ -11153,12 +11134,12 @@
"version": "v5.2.13",
"source": {
"type": "git",
"url": "https://github.com/justinrainbow/json-schema.git",
"url": "https://github.com/jsonrainbow/json-schema.git",
"reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
"url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
"reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
"shasum": ""
},
@ -11213,8 +11194,8 @@
"schema"
],
"support": {
"issues": "https://github.com/justinrainbow/json-schema/issues",
"source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
"issues": "https://github.com/jsonrainbow/json-schema/issues",
"source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13"
},
"time": "2023-09-26T02:20:38+00:00"
},
@ -11732,16 +11713,16 @@
},
{
"name": "react/promise",
"version": "v3.1.0",
"version": "v3.2.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
"reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c"
"reference": "8a164643313c71354582dc850b42b33fa12a4b63"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/e563d55d1641de1dea9f5e84f3cccc66d2bfe02c",
"reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c",
"url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63",
"reference": "8a164643313c71354582dc850b42b33fa12a4b63",
"shasum": ""
},
"require": {
@ -11793,7 +11774,7 @@
],
"support": {
"issues": "https://github.com/reactphp/promise/issues",
"source": "https://github.com/reactphp/promise/tree/v3.1.0"
"source": "https://github.com/reactphp/promise/tree/v3.2.0"
},
"funding": [
{
@ -11801,7 +11782,7 @@
"type": "open_collective"
}
],
"time": "2023-11-16T16:21:57+00:00"
"time": "2024-05-24T10:39:05+00:00"
},
{
"name": "react/socket",
@ -11967,12 +11948,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "c8cc0081bff33f9080302f312e3479c13d1f592d"
"reference": "0ec6bad5f4523eda2514e89d5ea48cde6ebe7f99"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/c8cc0081bff33f9080302f312e3479c13d1f592d",
"reference": "c8cc0081bff33f9080302f312e3479c13d1f592d",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0ec6bad5f4523eda2514e89d5ea48cde6ebe7f99",
"reference": "0ec6bad5f4523eda2514e89d5ea48cde6ebe7f99",
"shasum": ""
},
"conflict": {
@ -12339,8 +12320,8 @@
"neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6",
"neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3",
"neos/media-browser": "<7.3.19|>=8,<8.0.16|>=8.1,<8.1.11|>=8.2,<8.2.11|>=8.3,<8.3.9",
"neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2",
"neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5",
"neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2",
"neos/swiftmailer": "<5.4.5",
"netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15",
"nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6",
"nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13",
@ -12540,7 +12521,7 @@
"sylius/grid-bundle": "<1.10.1",
"sylius/paypal-plugin": ">=1,<1.2.4|>=1.3,<1.3.1",
"sylius/resource-bundle": ">=1,<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4",
"sylius/sylius": "<1.12.16|>=1.13.0.0-alpha1,<1.13.1",
"sylius/sylius": "<1.9.10|>=1.10,<1.10.11|>=1.11,<1.11.2|>=1.12.0.0-alpha1,<1.12.16|>=1.13.0.0-alpha1,<1.13.1",
"symbiote/silverstripe-multivaluefield": ">=3,<3.0.99",
"symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4",
"symbiote/silverstripe-seed": "<6.0.3",
@ -12629,12 +12610,14 @@
"uvdesk/core-framework": "<=1.1.1",
"vanilla/safecurl": "<0.9.2",
"verbb/comments": "<1.5.5",
"verbb/formie": "<2.1.6",
"verbb/image-resizer": "<2.0.9",
"verbb/knock-knock": "<1.2.8",
"verot/class.upload.php": "<=2.1.6",
"villagedefrance/opencart-overclocked": "<=1.11.1",
"vova07/yii2-fileapi-widget": "<0.1.9",
"vrana/adminer": "<4.8.1",
"vufind/vufind": ">=2,<9.1.1",
"waldhacker/hcaptcha": "<2.1.2",
"wallabag/tcpdf": "<6.2.22",
"wallabag/wallabag": "<2.6.7",
@ -12660,7 +12643,7 @@
"wpanel/wpanel4-cms": "<=4.3.1",
"wpcloud/wp-stateless": "<3.2",
"wpglobus/wpglobus": "<=1.9.6",
"wwbn/avideo": "<=12.4",
"wwbn/avideo": "<14.3",
"xataface/xataface": "<3",
"xpressengine/xpressengine": "<3.0.15",
"yab/quarx": "<2.4.5",
@ -12755,7 +12738,7 @@
"type": "tidelift"
}
],
"time": "2024-05-15T23:04:18+00:00"
"time": "2024-05-23T15:04:32+00:00"
},
{
"name": "softcreatr/jsonpath",
@ -12824,16 +12807,16 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "3.9.2",
"version": "3.10.1",
"source": {
"type": "git",
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
"reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480"
"reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480",
"reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480",
"url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
"reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
"shasum": ""
},
"require": {
@ -12900,7 +12883,7 @@
"type": "open_collective"
}
],
"time": "2024-04-23T20:25:34+00:00"
"time": "2024-05-22T21:24:41+00:00"
},
{
"name": "symfony/browser-kit",

4
protected/humhub/assets/AppAsset.php
View File

@ -12,8 +12,8 @@ use humhub\components\assets\WebStaticAssetBundle;
use humhub\modules\content\assets\ContentAsset;
use humhub\modules\content\assets\ContentHighlightAsset;
use humhub\modules\file\assets\FileAsset;
use yii\bootstrap\BootstrapAsset;
use yii\bootstrap\BootstrapPluginAsset;
use yii\bootstrap5\BootstrapAsset;
use yii\bootstrap5\BootstrapPluginAsset;
use yii\jui\JuiAsset;
use yii\validators\ValidationAsset;
use yii\web\JqueryAsset;

7
protected/humhub/compat/bootstrap/Html.php Normal file
View File

@ -0,0 +1,7 @@
<?php
namespace yii\bootstrap;
class Html extends \yii\bootstrap5\Html
{
}

4
protected/humhub/config/common.php
View File

@ -19,6 +19,10 @@ Yii::$classMap['Zend\Stdlib\ArrayObject'] = '@humhub/compat/ArrayObject.php';
Yii::$classMap['humhub\modules\search\interfaces\Searchable'] = '@humhub/compat/search/Searchable.php';
Yii::$classMap['humhub\modules\search\events\SearchAddEvent'] = '@humhub/compat/search/SearchAddEvent.php';
// Bootstrap 5 Migration
Yii::$classMap['yii\bootstrap\Html'] = '@humhub/compat/bootstrap/Html.php';
// Workaround: If OpenSSL extension is not available (#3852)
if (!defined('PKCS7_DETACHED')) {
define('PKCS7_DETACHED', 64);