Commit d8f13ef3 authored by Tobias Munk's avatar Tobias Munk

Merge branch 'experimental' into 'master'

updated Dockerfile image (bump php version). Updated packages

See merge request !1
parents 1c5261a6 5dad53c9
Pipeline #49651 passed with stages
in 1 minute and 42 seconds
FROM yiisoftware/yii2-php:7.2-apache
FROM yiisoftware/yii2-php:7.3-apache
RUN a2enmod rewrite
......
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "b133215816a78cf0f43cdd7984377d0a",
"packages": [
{
"name": "bower-asset/bootstrap",
"version": "v3.3.7",
"version": "v3.4.1",
"source": {
"type": "git",
"url": "https://github.com/twbs/bootstrap.git",
"reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86"
"reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/0b9c4a4007c44201dce9a6cc1a38407005c26c86",
"reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86",
"shasum": null
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/68b0d231a13201eb14acd3dc84e51543d16e5f7e",
"reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
},
"require": {
"bower-asset/jquery": ">=1.9.1,<4.0"
......@@ -33,14 +32,13 @@
"version": "3.3.11",
"source": {
"type": "git",
"url": "https://github.com/RobinHerbots/Inputmask.git",
"url": "git@github.com:RobinHerbots/Inputmask.git",
"reference": "5e670ad62f50c738388d4dcec78d2888505ad77b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/5e670ad62f50c738388d4dcec78d2888505ad77b",
"reference": "5e670ad62f50c738388d4dcec78d2888505ad77b",
"shasum": null
"reference": "5e670ad62f50c738388d4dcec78d2888505ad77b"
},
"require": {
"bower-asset/jquery": ">=1.7"
......@@ -52,17 +50,16 @@
},
{
"name": "bower-asset/jquery",
"version": "3.2.1",
"version": "3.4.1",
"source": {
"type": "git",
"url": "https://github.com/jquery/jquery-dist.git",
"reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e"
"reference": "15bc73803f76bc53b654b9fdbbbc096f56d7c03d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jquery/jquery-dist/zipball/77d2a51d0520d2ee44173afdf4e40a9201f5964e",
"reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e",
"shasum": null
"url": "https://api.github.com/repos/jquery/jquery-dist/zipball/15bc73803f76bc53b654b9fdbbbc096f56d7c03d",
"reference": "15bc73803f76bc53b654b9fdbbbc096f56d7c03d"
},
"type": "bower-asset",
"license": [
......@@ -80,8 +77,7 @@
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bestiejs/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3",
"reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3",
"shasum": null
"reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3"
},
"type": "bower-asset"
},
......@@ -90,14 +86,13 @@
"version": "2.0.7.1",
"source": {
"type": "git",
"url": "git@github.com:yiisoft/jquery-pjax.git",
"url": "https://github.com/yiisoft/jquery-pjax.git",
"reference": "aef7b953107264f00234902a3880eb50dafc48be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/aef7b953107264f00234902a3880eb50dafc48be",
"reference": "aef7b953107264f00234902a3880eb50dafc48be",
"shasum": null
"reference": "aef7b953107264f00234902a3880eb50dafc48be"
},
"require": {
"bower-asset/jquery": ">=1.8"
......@@ -109,16 +104,16 @@
},
{
"name": "cebe/markdown",
"version": "1.1.2",
"version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/cebe/markdown.git",
"reference": "25b28bae8a6f185b5030673af77b32e1163d5c6e"
"reference": "9bac5e971dd391e2802dca5400bbeacbaea9eb86"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cebe/markdown/zipball/25b28bae8a6f185b5030673af77b32e1163d5c6e",
"reference": "25b28bae8a6f185b5030673af77b32e1163d5c6e",
"url": "https://api.github.com/repos/cebe/markdown/zipball/9bac5e971dd391e2802dca5400bbeacbaea9eb86",
"reference": "9bac5e971dd391e2802dca5400bbeacbaea9eb86",
"shasum": ""
},
"require": {
......@@ -136,7 +131,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev"
"dev-master": "1.2.x-dev"
}
},
"autoload": {
......@@ -165,20 +160,20 @@
"markdown",
"markdown-extra"
],
"time": "2017-07-16T21:13:23+00:00"
"time": "2018-03-26T11:24:36+00:00"
},
{
"name": "codemix/yii2-streamlog",
"version": "1.2.1",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/codemix/yii2-streamlog.git",
"reference": "46717733b46a91dd323888349b323fb0bd989e2e"
"reference": "1ed104f4bc4e961d1d08fb92d6854f01b1bd0b80"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/codemix/yii2-streamlog/zipball/46717733b46a91dd323888349b323fb0bd989e2e",
"reference": "46717733b46a91dd323888349b323fb0bd989e2e",
"url": "https://api.github.com/repos/codemix/yii2-streamlog/zipball/1ed104f4bc4e961d1d08fb92d6854f01b1bd0b80",
"reference": "1ed104f4bc4e961d1d08fb92d6854f01b1bd0b80",
"shasum": ""
},
"type": "library",
......@@ -204,27 +199,27 @@
"stream",
"yii2"
],
"time": "2017-02-16T14:50:01+00:00"
"time": "2020-03-26T13:23:28+00:00"
},
{
"name": "ezyang/htmlpurifier",
"version": "v4.9.3",
"version": "v4.12.0",
"source": {
"type": "git",
"url": "https://github.com/ezyang/htmlpurifier.git",
"reference": "95e1bae3182efc0f3422896a3236e991049dac69"
"reference": "a617e55bc62a87eec73bd456d146d134ad716f03"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/95e1bae3182efc0f3422896a3236e991049dac69",
"reference": "95e1bae3182efc0f3422896a3236e991049dac69",
"url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03",
"reference": "a617e55bc62a87eec73bd456d146d134ad716f03",
"shasum": ""
},
"require": {
"php": ">=5.2"
},
"require-dev": {
"simpletest/simpletest": "^1.1"
"simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd"
},
"type": "library",
"autoload": {
......@@ -237,7 +232,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL"
"LGPL-2.1-or-later"
],
"authors": [
{
......@@ -251,32 +246,172 @@
"keywords": [
"html"
],
"time": "2017-06-03T02:28:16+00:00"
"time": "2019-10-28T03:44:26+00:00"
},
{
"name": "opis/closure",
"version": "3.5.4",
"source": {
"type": "git",
"url": "https://github.com/opis/closure.git",
"reference": "1d0deef692f66dae5d70663caee2867d0971306b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/opis/closure/zipball/1d0deef692f66dae5d70663caee2867d0971306b",
"reference": "1d0deef692f66dae5d70663caee2867d0971306b",
"shasum": ""
},
"require": {
"php": "^5.4 || ^7.0"
},
"require-dev": {
"jeremeamia/superclosure": "^2.0",
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.5.x-dev"
}
},
"autoload": {
"psr-4": {
"Opis\\Closure\\": "src/"
},
"files": [
"functions.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Marius Sarca",
"email": "marius.sarca@gmail.com"
},
{
"name": "Sorin Sarca",
"email": "sarca_sorin@hotmail.com"
}
],
"description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
"homepage": "https://opis.io/closure",
"keywords": [
"anonymous functions",
"closure",
"function",
"serializable",
"serialization",
"serialize"
],
"time": "2020-06-07T11:41:29+00:00"
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"suggest": {
"ext-ctype": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Ctype\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Gert de Pagter",
"email": "BackEndTea@gmail.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for ctype functions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"ctype",
"polyfill",
"portable"
],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-05-12T16:14:59+00:00"
},
{
"name": "vlucas/phpdotenv",
"version": "v2.4.0",
"version": "v2.6.5",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
"reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
"reference": "2e977311ffb17b2f82028a9c36824647789c6365"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
"reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2e977311ffb17b2f82028a9c36824647789c6365",
"reference": "2e977311ffb17b2f82028a9c36824647789c6365",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
"php": "^5.3.9 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.16"
},
"require-dev": {
"phpunit/phpunit": "^4.8 || ^5.0"
"ext-filter": "*",
"ext-pcre": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7.27"
},
"suggest": {
"ext-filter": "Required to use the boolean validator.",
"ext-pcre": "Required to use most of the library."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.4-dev"
"dev-master": "2.6-dev"
}
},
"autoload": {
......@@ -286,13 +421,18 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause-Attribution"
"BSD-3-Clause"
],
"authors": [
{
"name": "Graham Campbell",
"email": "graham@alt-three.com",
"homepage": "https://gjcampbell.co.uk/"
},
{
"name": "Vance Lucas",
"email": "vance@vancelucas.com",
"homepage": "http://www.vancelucas.com"
"homepage": "https://vancelucas.com/"
}
],
"description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
......@@ -301,28 +441,38 @@
"env",
"environment"
],
"time": "2016-09-01T10:05:43+00:00"
"funding": [
{
"url": "https://github.com/GrahamCampbell",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
"type": "tidelift"
}
],
"time": "2020-06-02T14:06:52+00:00"
},
{
"name": "yiisoft/yii2",
"version": "2.0.13.1",
"version": "2.0.35",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-framework.git",
"reference": "7af96d8da5ea3e9a5dd05d0e734b21c5726a6ddf"
"reference": "d42809e4969cdc0adb97197ba32774b3e4cd9e8e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/7af96d8da5ea3e9a5dd05d0e734b21c5726a6ddf",
"reference": "7af96d8da5ea3e9a5dd05d0e734b21c5726a6ddf",
"url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/d42809e4969cdc0adb97197ba32774b3e4cd9e8e",
"reference": "d42809e4969cdc0adb97197ba32774b3e4cd9e8e",
"shasum": ""
},
"require": {
"bower-asset/inputmask": "~3.2.2 | ~3.3.5",
"bower-asset/jquery": "3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
"bower-asset/jquery": "3.4.*@stable | 3.3.*@stable | 3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
"bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": "~2.0.1",
"cebe/markdown": "~1.0.0 | ~1.1.0",
"cebe/markdown": "~1.0.0 | ~1.1.0 | ~1.2.0",
"ext-ctype": "*",
"ext-mbstring": "*",
"ezyang/htmlpurifier": "~4.6",
......@@ -401,26 +551,43 @@
"framework",
"yii2"
],
"time": "2017-11-14T11:08:21+00:00"
"funding": [
{
"url": "https://github.com/yiisoft",
"type": "github"
},
{
"url": "https://opencollective.com/yiisoft",
"type": "open_collective"
},
{
"url": "https://tidelift.com/funding/github/packagist/yiisoft/yii2",
"type": "tidelift"
}
],
"time": "2020-05-02T11:11:31+00:00"
},
{
"name": "yiisoft/yii2-bootstrap",
"version": "2.0.7",
"version": "2.0.10",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-bootstrap.git",
"reference": "02a54d868343ed11d02f0f0f8cbbecb590e0cb3f"
"reference": "073c9ab0a4eb71f2485d84c96a1967130300d8fc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/02a54d868343ed11d02f0f0f8cbbecb590e0cb3f",
"reference": "02a54d868343ed11d02f0f0f8cbbecb590e0cb3f",
"url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/073c9ab0a4eb71f2485d84c96a1967130300d8fc",
"reference": "073c9ab0a4eb71f2485d84c96a1967130300d8fc",
"shasum": ""
},
"require": {
"bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*",
"bower-asset/bootstrap": "3.4.* | 3.3.* | 3.2.* | 3.1.*",
"yiisoft/yii2": "~2.0.6"
},
"require-dev": {
"phpunit/phpunit": "<7"
},
"type": "yii2-extension",
"extra": {
"branch-alias": {
......@@ -429,7 +596,7 @@
},
"autoload": {
"psr-4": {
"yii\\bootstrap\\": ""
"yii\\bootstrap\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
......@@ -437,9 +604,23 @@
"BSD-3-Clause"
],
"authors": [
{
"name": "Paul Klimov",
"email": "klimov.paul@gmail.com"
},
{
"name": "Alexander Makarov",
"email": "sam@rmcreative.ru",
"homepage": "http://rmcreative.ru/"
},
{
"name": "Antonio Ramirez",
"email": "amigo.cobos@gmail.com"
},
{
"name": "Qiang Xue",
"email": "qiang.xue@gmail.com"
"email": "qiang.xue@gmail.com",
"homepage": "http://www.yiiframework.com/"
}
],
"description": "The Twitter Bootstrap extension for the Yii framework",
......@@ -447,27 +628,28 @@
"bootstrap",
"yii2"
],
"time": "2017-10-09T19:48:22+00:00"
"time": "2019-04-23T13:18:43+00:00"
},
{
"name": "yiisoft/yii2-composer",
"version": "2.0.5",
"version": "2.0.9",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-composer.git",
"reference": "3f4923c2bde6caf3f5b88cc22fdd5770f52f8df2"
"reference": "d191176c4f8372e397a9e3df27360dca6a70efaa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/3f4923c2bde6caf3f5b88cc22fdd5770f52f8df2",
"reference": "3f4923c2bde6caf3f5b88cc22fdd5770f52f8df2",
"url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/d191176c4f8372e397a9e3df27360dca6a70efaa",
"reference": "d191176c4f8372e397a9e3df27360dca6a70efaa",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0"
"composer-plugin-api": "^1.0 | ^2.0"
},
"require-dev": {
"composer/composer": "^1.0"
"composer/composer": "^1.0 | ^2.0@dev",
"phpunit/phpunit": "<7"
},
"type": "composer-plugin",
"extra": {
......@@ -489,6 +671,10 @@
{
"name": "Qiang Xue",
"email": "qiang.xue@gmail.com"
},
{
"name": "Carsten Brandt",
"email": "mail@cebe.cc"
}
],
"description": "The composer plugin for Yii extension installer",
......@@ -497,25 +683,46 @@
"extension installer",
"yii2"
],
"time": "2016-12-20T13:26:02+00:00"
"funding": [
{
"url": "https://github.com/yiisoft",
"type": "github"
},
{
"url": "https://opencollective.com/yiisoft",
"type": "open_collective"
},
{
"url": "https://tidelift.com/funding/github/packagist/yiisoft/yii2-composer",
"type": "tidelift"
}
],
"time": "2020-04-20T18:47:46+00:00"
},
{
"name": "yiisoft/yii2-debug",
"version": "2.0.13",
"version": "2.1.13",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-debug.git",
"reference": "b37f414959c2fafefb332020b42037cd17c1cb7f"
"reference": "696712a2a3565b1a072ad3c9d298e262967e8282"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/b37f414959c2fafefb332020b42037cd17c1cb7f",
"reference": "b37f414959c2fafefb332020b42037cd17c1cb7f",
"url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/696712a2a3565b1a072ad3c9d298e262967e8282",
"reference": "696712a2a3565b1a072ad3c9d298e262967e8282",
"shasum": ""
},
"require": {
"yiisoft/yii2": "~2.0.13",
"yiisoft/yii2-bootstrap": "~2.0.0"
"ext-mbstring": "*",
"opis/closure": "^3.3",
"php": ">=5.4",
"yiisoft/yii2": "~2.0.13"
},
"require-dev": {
"phpunit/phpunit": "<7",
"yiisoft/yii2-coding-standards": "~2.0",
"yiisoft/yii2-swiftmailer": "*"
},
"type": "yii2-extension",
"extra": {
......@@ -525,7 +732,7 @@
},
"autoload": {
"psr-4": {
"yii\\debug\\": ""
"yii\\debug\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
......@@ -536,6 +743,10 @@
{
"name": "Qiang Xue",
"email": "qiang.xue@gmail.com"
},
{
"name": "Simon Karlen",
"email": "simi.albi@outlook.com"
}
],
"description": "The debugger extension for the Yii framework",
......@@ -544,7 +755,7 @@
"debugger",
"yii2"
],
"time": "2017-12-05T07:36:23+00:00"
"time": "2020-01-17T13:40:32+00:00"
}
],
"packages-dev": [],
......@@ -554,5 +765,6 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
"platform-dev": []
"platform-dev": [],
"plugin-api-version": "1.1.0"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment