Merge branch 'release/v4.4.2'

ACP3/Core/Application/BootstrapInterface.php

@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
     /**
      * Contains the current ACP3 version string
      */
-    const VERSION = '4.4.1';
+    const VERSION = '4.4.2';
 
     /**
      * Performs some startup checks

ACP3/Core/Picture.php

@@ -16,7 +16,7 @@ class Picture
     /**
      * @var string
      */
-    protected $cacheDir = 'images/';
+    protected $cacheDir = '';
     /**
      * @var string
      */
@@ -81,6 +81,8 @@ class Picture
         $this->response = $response;
         $this->appPath = $appPath;
         $this->environment = $environment;
+
+        $this->cacheDir = $this->appPath->getCacheDir() . 'images/';
     }
 
     /**
@@ -111,7 +113,11 @@ class Picture
      */
     public function setCacheDir($cacheDir)
     {
-        $this->cacheDir = $cacheDir;
+        if (empty($cacheDir)) {
+            throw new \InvalidArgumentException('The cache directory for the images must not be empty.');
+        }
+
+        $this->cacheDir = $cacheDir . (!preg_match('=/$=', $cacheDir) ? '/' : '');
         return $this;
     }
 
@@ -244,14 +250,6 @@ class Picture
         return false;
     }
 
-    /**
-     * @return string
-     */
-    public function getWebFilePath()
-    {
-        return $this->appPath->getWebRoot() . 'cache/' . $this->environment . '/' . $this->cacheDir . $this->getCacheName();
-    }
-
     /**
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -267,7 +265,7 @@ class Picture
      */
     protected function getCacheFileName()
     {
-        return $this->appPath->getCacheDir() . $this->cacheDir . $this->getCacheName();
+        return $this->cacheDir . $this->getCacheName();
     }
 
     /**
@@ -392,9 +390,8 @@ class Picture
      */
     protected function createCacheDir()
     {
-        $path = $this->appPath->getCacheDir() . $this->cacheDir;
-        if (!is_dir($path) && is_writable($this->appPath->getCacheDir())) {
-            mkdir($path);
+        if (!is_dir($this->cacheDir)) {
+            @mkdir($this->cacheDir);
         }
     }
 }

ACP3/Modules/ACP3/Acp/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/Articles/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "suggest": {
     "acp3/module-seo": "Provides additional SEO capabilities"

ACP3/Modules/ACP3/Captcha/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/Categories/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/Comments/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "suggest": {
     "acp3/module-captcha": "Provides basic protection against spam bots."

ACP3/Modules/ACP3/Contact/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "suggest": {
     "acp3/module-captcha": "Provides basic protection against spam bots."

ACP3/Modules/ACP3/Emoticons/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/Errors/composer.json

@@ -17,11 +17,11 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/Feeds/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1",
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2",
     "mibe/feedwriter": "^1.0"
   },
   "autoload": {

ACP3/Modules/ACP3/Filemanager/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/Files/composer.json

@@ -17,13 +17,13 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1",
-    "acp3/module-categories": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2",
+    "acp3/module-categories": "^4.4.2"
   },
   "suggest": {
     "acp3/module-seo": "Provides additional SEO capabilities"

ACP3/Modules/ACP3/Gallery/Controller/Admin/Index/Settings.php

@@ -105,7 +105,7 @@ class Settings extends Core\Controller\AbstractAdminAction
                 || $formData['width'] !== $settings['width']
                 || $formData['height'] !== $settings['height']
             ) {
-                Core\Cache\Purge::doPurge($this->appPath->getCacheDir() . 'images', 'gallery');
+                Core\Cache\Purge::doPurge($this->appPath->getUploadsDir() . 'gallery/cache', 'gallery');
 
                 $this->get('gallery.cache.core')->getDriver()->deleteAll();
             }

ACP3/Modules/ACP3/Gallery/Controller/Frontend/Index/Image.php

@@ -54,6 +54,7 @@ class Image extends AbstractAction
         $image
             ->setEnableCache($this->config->getSettings(Schema::MODULE_NAME)['cache_images'] == 1)
             ->setCachePrefix('gallery_' . $action)
+            ->setCacheDir($this->appPath->getUploadsDir() . 'gallery/cache/')
             ->setMaxWidth($this->settings[$action . 'width'])
             ->setMaxHeight($this->settings[$action . 'height'])
             ->setFile($this->appPath->getUploadsDir() . 'gallery/' . $picture)

ACP3/Modules/ACP3/Gallery/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "suggest": {
     "acp3/module-seo": "Provides additional SEO capabilities"

ACP3/Modules/ACP3/Guestbook/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "suggest": {
     "acp3/module-captcha": "Provides basic protection against spam bots."

ACP3/Modules/ACP3/Menus/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/News/composer.json

@@ -17,13 +17,13 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1",
-    "acp3/module-categories": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2",
+    "acp3/module-categories": "^4.4.2"
   },
   "suggest": {
     "acp3/module-seo": "Provides additional SEO capabilities"

ACP3/Modules/ACP3/Newsletter/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "suggest": {
     "acp3/module-captcha": "Provides basic protection against spam bots."

ACP3/Modules/ACP3/Permissions/composer.json

@@ -17,11 +17,11 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/Polls/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/Search/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/Seo/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1",
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2",
     "thepixeldeveloper/sitemap": "^4.4.2"
   },
   "autoload": {

ACP3/Modules/ACP3/System/composer.json

@@ -18,11 +18,11 @@
   "require": {
     "composer/semver": "^1.4",
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-users": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-users": "^4.4.2"
   },
   "autoload": {
     "psr-4": {

ACP3/Modules/ACP3/Users/composer.json

@@ -17,11 +17,11 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1"
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2"
   },
   "suggest": {
     "acp3/module-captcha": "Provides basic protection against spam bots."

ACP3/Modules/ACP3/WYSIWYGCKEditor/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1",
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2",
     "ckeditor/ckeditor": "dev-full/4.5.x"
   },
   "autoload": {

ACP3/Modules/ACP3/WYSIWYGTinyMCE/composer.json

@@ -17,12 +17,12 @@
   "prefer-stable": true,
   "require": {
     "acp3/composer-installer": "*",
-    "acp3/core": "^4.4.1",
-    "acp3/setup": "^4.4.1",
-    "acp3/module-errors": "^4.4.1",
-    "acp3/module-permissions": "^4.4.1",
-    "acp3/module-system": "^4.4.1",
-    "acp3/module-users": "^4.4.1",
+    "acp3/core": "^4.4.2",
+    "acp3/setup": "^4.4.2",
+    "acp3/module-errors": "^4.4.2",
+    "acp3/module-permissions": "^4.4.2",
+    "acp3/module-system": "^4.4.2",
+    "acp3/module-users": "^4.4.2",
     "tinymce/tinymce": "^4.4"
   },
   "autoload": {

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.4.2] - 2016-11-17
+### Added
+- [#56](https://github.com/ACP3/cms/issues/56) Made the cache directory of the `ACP3\Core\Picture` class configurable
+ 
+### Changed
+- The cached pictures of the gallery module are now being generated in the uploads/gallery/cache folder 
+
 ## [4.4.1] - 2016-11-15
 ### Fixed
 - Fixed the menu item management
@@ -192,6 +199,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Silenced a possible PHP warning when trying to login with incorrect credentials 
 
 [Unreleased]: https://github.com/ACP3/cms/compare/v4.4.1...HEAD
+[4.4.2]: https://github.com/ACP3/cms/compare/v4.4.1...v4.4.2
 [4.4.1]: https://github.com/ACP3/cms/compare/v4.4.0...v4.4.1
 [4.4.0]: https://github.com/ACP3/cms/compare/v4.3.6...v4.4.0
 [4.3.6]: https://github.com/ACP3/cms/compare/v4.3.5...v4.3.6

composer.lock

@@ -1821,16 +1821,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.2.0",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "dff51f72b0706335131b00a7f49606168c582594"
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
-                "reference": "dff51f72b0706335131b00a7f49606168c582594",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
                 "shasum": ""
             },
             "require": {
@@ -1842,7 +1842,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
@@ -1876,7 +1876,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-05-18 14:26:46"
+            "time": "2016-11-14 01:06:16"
         },
         {
             "name": "symfony/yaml",
@@ -2073,16 +2073,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v1.12.3",
+            "version": "v1.12.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "78a820c16d13f593303511461eefa939502fb2de"
+                "reference": "c5a9d66dd27f02a3ffba4ec451ce27702604cdc8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/78a820c16d13f593303511461eefa939502fb2de",
-                "reference": "78a820c16d13f593303511461eefa939502fb2de",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c5a9d66dd27f02a3ffba4ec451ce27702604cdc8",
+                "reference": "c5a9d66dd27f02a3ffba4ec451ce27702604cdc8",
                 "shasum": ""
             },
             "require": {
@@ -2127,7 +2127,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2016-10-30 12:07:10"
+            "time": "2016-11-15 09:10:47"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -2747,16 +2747,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.8",
+            "version": "1.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
+                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
                 "shasum": ""
             },
             "require": {
@@ -2792,20 +2792,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2015-09-15 10:49:45"
+            "time": "2016-11-15 14:06:22"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.6.2",
+            "version": "5.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "cd13b23ac5a519a4708e00736c26ee0bb28b2e01"
+                "reference": "a9de0dbafeb6b1391b391fbb034734cb0af9f67c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/cd13b23ac5a519a4708e00736c26ee0bb28b2e01",
-                "reference": "cd13b23ac5a519a4708e00736c26ee0bb28b2e01",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9de0dbafeb6b1391b391fbb034734cb0af9f67c",
+                "reference": "a9de0dbafeb6b1391b391fbb034734cb0af9f67c",
                 "shasum": ""
             },
             "require": {
@@ -2874,7 +2874,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-10-25 07:40:25"