diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-09 00:16:22 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-09 00:16:22 +0200 |
| commit | dccc0877c1cc34826c5178247a06e8c1ca7702a0 (patch) | |
| tree | eba5471cf1326477bc39a77b7391b6792f8e0cec /phpBB | |
| parent | 9d18b3d1eeb1cb755fb7949bad07a7586eef4962 (diff) | |
| parent | 58286171f1035495c8c2a6fdffce9f3842601e66 (diff) | |
| download | forums-dccc0877c1cc34826c5178247a06e8c1ca7702a0.tar forums-dccc0877c1cc34826c5178247a06e8c1ca7702a0.tar.gz forums-dccc0877c1cc34826c5178247a06e8c1ca7702a0.tar.bz2 forums-dccc0877c1cc34826c5178247a06e8c1ca7702a0.tar.xz forums-dccc0877c1cc34826c5178247a06e8c1ca7702a0.zip | |
Merge pull request #3891 from marc1706/ticket/14150
[ticket/14150] Update fast-image-size to newest version
* marc1706/ticket/14150:
[ticket/14150] Update fast-image-size to newest version
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/composer.json | 2 | ||||
| -rw-r--r-- | phpBB/composer.lock | 16 | ||||
| -rw-r--r-- | phpBB/config/default/container/services.yml | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_upload.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/driver.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/parser.php | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index 2edd33a217..70319fe3fb 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -26,7 +26,7 @@ }, "require": { "lusitanian/oauth": "0.2.*", - "marc1706/fast-image-size": "1.0.*", + "marc1706/fast-image-size": "1.1.*", "patchwork/utf8": "1.1.*", "php": ">=5.3.9", "s9e/text-formatter": "dev-release/php5.3", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 5d7dc1a702..7d45abc6e3 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "94d0f6dab53f11dab1de63c0ae519ee6", + "hash": "da690ad4ab4884661792b4b9d648934a", "packages": [ { "name": "lusitanian/oauth", @@ -71,16 +71,16 @@ }, { "name": "marc1706/fast-image-size", - "version": "v1.0.2", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/marc1706/fast-image-size.git", - "reference": "ab7b594325cdf6b374d50b3934c8d16dd5249a2a" + "reference": "27467cfeca8fb2afd7ef3ffeea6d28a84f79df41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/ab7b594325cdf6b374d50b3934c8d16dd5249a2a", - "reference": "ab7b594325cdf6b374d50b3934c8d16dd5249a2a", + "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/27467cfeca8fb2afd7ef3ffeea6d28a84f79df41", + "reference": "27467cfeca8fb2afd7ef3ffeea6d28a84f79df41", "shasum": "" }, "require": { @@ -92,8 +92,8 @@ "type": "library", "autoload": { "psr-4": { - "fastImageSize\\": "lib", - "fastImageSize\\tests\\": "tests" + "FastImageSize\\": "lib", + "FastImageSize\\tests\\": "tests" } }, "notification-url": "https://packagist.org/downloads/", @@ -118,7 +118,7 @@ "php", "size" ], - "time": "2015-04-09 11:19:59" + "time": "2015-08-21 11:40:30" }, { "name": "patchwork/utf8", diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index 25b0a85913..288785201c 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -148,7 +148,7 @@ services: - @mimetype.guesser upload_imagesize: - class: fastImageSize\fastImageSize + class: FastImageSize\FastImageSize version_helper: class: phpbb\version_helper diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index dcc9bc4874..3ab87ee794 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -403,7 +403,7 @@ class filespec $this->width = $this->height = 0; // Get imagesize class - $imagesize = new \fastImageSize\fastImageSize(); + $imagesize = new \FastImageSize\FastImageSize(); $this->image_info = $imagesize->getImageSize($this->destination_file, $this->mimetype); diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index c50212e8ff..31fc1577a2 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -403,7 +403,7 @@ class bbcode_firstpass extends bbcode if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width']) { - $imagesize = new \fastImageSize\fastImageSize(); + $imagesize = new \FastImageSize\FastImageSize(); $size_info = $imagesize->getImageSize(htmlspecialchars_decode($in)); if ($size_info === false) diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index b6fd380bda..c849533166 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -30,7 +30,7 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface */ protected $config; - /** @var \fastImageSize\fastImageSize */ + /** @var \FastImageSize\FastImageSize */ protected $imagesize; /** @@ -76,13 +76,13 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface * Construct a driver object * * @param \phpbb\config\config $config phpBB configuration - * @param \fastImageSize\fastImageSize $imagesize fastImageSize class + * @param \FastImageSize\FastImageSize $imagesize FastImageSize class * @param string $phpbb_root_path Path to the phpBB root * @param string $php_ext PHP file extension * @param \phpbb\path_helper $path_helper phpBB path helper * @param \phpbb\cache\driver\driver_interface $cache Cache driver */ - public function __construct(\phpbb\config\config $config, \fastImageSize\fastImageSize $imagesize, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\cache\driver\driver_interface $cache = null) + public function __construct(\phpbb\config\config $config, \FastImageSize\FastImageSize $imagesize, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\cache\driver\driver_interface $cache = null) { $this->config = $config; $this->imagesize = $imagesize; diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php index 838c211e56..ffaffbc63c 100644 --- a/phpBB/phpbb/textformatter/s9e/parser.php +++ b/phpBB/phpbb/textformatter/s9e/parser.php @@ -370,7 +370,7 @@ class parser implements \phpbb\textformatter\parser_interface if ($max_height || $max_width) { - $imagesize = new \fastImageSize\fastImageSize(); + $imagesize = new \FastImageSize\FastImageSize(); $size_info = $imagesize->getImageSize($url); if ($size_info === false) { |