Merge branch '1.x' into site

consolidation · Feb 8, 2019 · 8bec6a6 · 8bec6a6
2 parents 455bf1d + 3190872
commit 8bec6a6
Show file tree

Hide file tree

Showing 8 changed files with 177 additions and 164 deletions.
diff --git a/.scenarios.lock/symfony2/composer.json b/.scenarios.lock/symfony2/composer.json
@@ -41,7 +41,7 @@
         "g1a/composer-test-scenarios": "^3",
         "patchwork/jsqueeze": "~2",
         "natxet/CssMin": "3.0.4",
-        "pear/archive_tar": "^1.4.2",
+        "pear/archive_tar": "^1.4.4",
         "codeception/base": "^2.3.7",
         "codeception/verify": "^0.3.2",
         "codeception/aspect-mock": "^1|^2.1.1",

diff --git a/.scenarios.lock/symfony4/composer.json b/.scenarios.lock/symfony4/composer.json
@@ -41,7 +41,7 @@
         "g1a/composer-test-scenarios": "^3",
         "patchwork/jsqueeze": "~2",
         "natxet/CssMin": "3.0.4",
-        "pear/archive_tar": "^1.4.2",
+        "pear/archive_tar": "^1.4.4",
         "codeception/base": "^2.3.7",
         "goaop/framework": "~2.1.2",
         "codeception/verify": "^0.3.2",

diff --git a/.scenarios.lock/symfony4/composer.lock b/.scenarios.lock/symfony4/composer.lock
diff --git a/LICENSE b/LICENSE
@@ -34,11 +34,11 @@ grasmash/yaml-expander               1.4.0    MIT
 league/container                     2.4.1    MIT
 psr/container                        1.0.0    MIT
 psr/log                              1.1.0    MIT
-symfony/console                      v4.2.1   MIT
-symfony/event-dispatcher             v4.2.1   MIT
-symfony/filesystem                   v4.2.1   MIT
-symfony/finder                       v3.4.20  MIT
+symfony/console                      v4.2.2   MIT
+symfony/event-dispatcher             v4.2.2   MIT
+symfony/filesystem                   v4.2.2   MIT
+symfony/finder                       v3.4.21  MIT
 symfony/polyfill-ctype               v1.10.0  MIT
 symfony/polyfill-mbstring            v1.10.0  MIT
-symfony/process                      v4.2.1   MIT
-symfony/yaml                         v4.2.1   MIT
+symfony/process                      v4.2.2   MIT
+symfony/yaml                         v4.2.2   MIT
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "g1a/composer-test-scenarios": "^3",
         "patchwork/jsqueeze": "~2",
         "natxet/CssMin": "3.0.4",
-        "pear/archive_tar": "^1.4.2",
+        "pear/archive_tar": "^1.4.4",
         "codeception/base": "^2.3.7",
         "goaop/framework": "~2.1.2",
         "codeception/verify": "^0.3.2",