diff --git a/.gitignore b/.gitignore index e76b330e4..13171d4cc 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,4 @@ config.codekit composer.phar web/uploads/ /bin - +composer-dev.* diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b30a76ae..9aab256fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 5.1.1 + +* Updated symfony/symfony: 2.8.44 +* Updated os2display/admin-bundle: 1.1.1 + ## 5.1.0 * Updated symfony/symfony: 2.8.42 diff --git a/composer.lock b/composer.lock index ce25561c7..991af7e6b 100644 --- a/composer.lock +++ b/composer.lock @@ -2644,16 +2644,16 @@ }, { "name": "os2display/admin-bundle", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/os2display/admin-bundle.git", - "reference": "317661f9c97de01e7e3364a4e745a63beb36788e" + "reference": "20f0703841539e976b347be848135af0647cac40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/os2display/admin-bundle/zipball/317661f9c97de01e7e3364a4e745a63beb36788e", - "reference": "317661f9c97de01e7e3364a4e745a63beb36788e", + "url": "https://api.github.com/repos/os2display/admin-bundle/zipball/20f0703841539e976b347be848135af0647cac40", + "reference": "20f0703841539e976b347be848135af0647cac40", "shasum": "" }, "require": { @@ -2667,10 +2667,10 @@ }, "description": "Os2Display admin", "support": { - "source": "https://github.com/os2display/admin-bundle/tree/1.1.0", + "source": "https://github.com/os2display/admin-bundle/tree/1.1.1", "issues": "https://github.com/os2display/admin-bundle/issues" }, - "time": "2018-07-03T07:30:32+00:00" + "time": "2018-08-23T05:33:52+00:00" }, { "name": "os2display/core-bundle", @@ -2681,10 +2681,10 @@ "reference": "b431187b00bd90d8dc1ce060ea9bb4ec54308de0" }, "dist": { - "type": "zip", + "type": "path", "url": "https://api.github.com/repos/os2display/core-bundle/zipball/b431187b00bd90d8dc1ce060ea9bb4ec54308de0", "reference": "b431187b00bd90d8dc1ce060ea9bb4ec54308de0", - "shasum": "" + "shasum": null }, "require": { "debril/rss-atom-bundle": "2.2", @@ -2729,12 +2729,7 @@ "Os2Display\\CoreBundle\\": "" } }, - "description": "Os2Display core", - "support": { - "source": "https://github.com/os2display/core-bundle/tree/1.1.0", - "issues": "https://github.com/os2display/core-bundle/issues" - }, - "time": "2018-07-03T07:53:37+00:00" + "description": "Os2Display core" }, { "name": "os2display/default-template-bundle", @@ -2745,10 +2740,10 @@ "reference": "bed9eb33fc549f7d04760cf9e890cd165f5ffcbe" }, "dist": { - "type": "zip", + "type": "path", "url": "https://api.github.com/repos/os2display/default-template-bundle/zipball/bed9eb33fc549f7d04760cf9e890cd165f5ffcbe", "reference": "bed9eb33fc549f7d04760cf9e890cd165f5ffcbe", - "shasum": "" + "shasum": null }, "type": "symfony-bundle", "autoload": { @@ -2756,12 +2751,7 @@ "Os2Display\\DefaultTemplateBundle\\": "" } }, - "description": "Os2Display default template", - "support": { - "source": "https://github.com/os2display/default-template-bundle/tree/1.1.0", - "issues": "https://github.com/os2display/default-template-bundle/issues" - }, - "time": "2018-07-02T13:17:25+00:00" + "description": "Os2Display default template" }, { "name": "os2display/media-bundle", @@ -2772,10 +2762,10 @@ "reference": "039a6f602cf75846334c08137d009e04609e9905" }, "dist": { - "type": "zip", + "type": "path", "url": "https://api.github.com/repos/os2display/media-bundle/zipball/039a6f602cf75846334c08137d009e04609e9905", "reference": "039a6f602cf75846334c08137d009e04609e9905", - "shasum": "" + "shasum": null }, "require": { "sonata-project/media-bundle": "^2.0" @@ -2786,12 +2776,7 @@ "Os2Display\\MediaBundle\\": "" } }, - "description": "Os2Display media", - "support": { - "source": "https://github.com/os2display/media-bundle/tree/1.0.2", - "issues": "https://github.com/os2display/media-bundle/issues" - }, - "time": "2017-09-19T09:29:02+00:00" + "description": "Os2Display media" }, { "name": "paragonie/random_compat", @@ -4892,16 +4877,16 @@ }, { "name": "symfony/symfony", - "version": "v2.8.42", + "version": "v2.8.44", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "0084ec5bb6614688f547ef80bf1ef8a900c4e350" + "reference": "789dc7eb57579185a430e65c5efce4b2d6b6b7b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/0084ec5bb6614688f547ef80bf1ef8a900c4e350", - "reference": "0084ec5bb6614688f547ef80bf1ef8a900c4e350", + "url": "https://api.github.com/repos/symfony/symfony/zipball/789dc7eb57579185a430e65c5efce4b2d6b6b7b1", + "reference": "789dc7eb57579185a430e65c5efce4b2d6b6b7b1", "shasum": "" }, "require": { @@ -5028,7 +5013,7 @@ "keywords": [ "framework" ], - "time": "2018-06-25T12:02:18+00:00" + "time": "2018-08-01T14:12:49+00:00" }, { "name": "twig/extensions", diff --git a/update_bundles.sh b/update_bundles.sh new file mode 100755 index 000000000..b48f81341 --- /dev/null +++ b/update_bundles.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +############################### +# Updates bundles and symfony # +############################### + +bold=$(tput bold) +normal=$(tput sgr0) + +composer="$(which composer)" +php -d memory_limit=-1 $composer update symfony/symfony os2display/core-bundle os2display/admin-bundle os2display/default-template-bundle os2display/media-bundle