makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14150] Update fast-image-size to newest version

Browse source 
PHPBB3-14150
This commit is contained in:
Marc Alexander 2015-09-08 12:59:55 +02:00
parent 3ddee852fa
commit 58286171f1
9 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/composer.json
View file

@ -26,7 +26,7 @@
}, },
"require": { "require": {
"lusitanian/oauth": "0.2.*", "lusitanian/oauth": "0.2.*",
"marc1706/fast-image-size": "1.0.*", "marc1706/fast-image-size": "1.1.*",
"patchwork/utf8": "1.1.*", "patchwork/utf8": "1.1.*",
"php": ">=5.3.9", "php": ">=5.3.9",
"s9e/text-formatter": "dev-release/php5.3", "s9e/text-formatter": "dev-release/php5.3",

16
phpBB/composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "94d0f6dab53f11dab1de63c0ae519ee6", "hash": "da690ad4ab4884661792b4b9d648934a",
"packages": [ "packages": [
{ {
"name": "lusitanian/oauth", "name": "lusitanian/oauth",
@ -71,16 +71,16 @@
}, },
{ {
"name": "marc1706/fast-image-size", "name": "marc1706/fast-image-size",
"version": "v1.0.2", "version": "v1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/marc1706/fast-image-size.git", "url": "https://github.com/marc1706/fast-image-size.git",
"reference": "ab7b594325cdf6b374d50b3934c8d16dd5249a2a" "reference": "27467cfeca8fb2afd7ef3ffeea6d28a84f79df41"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/ab7b594325cdf6b374d50b3934c8d16dd5249a2a", "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/27467cfeca8fb2afd7ef3ffeea6d28a84f79df41",
"reference": "ab7b594325cdf6b374d50b3934c8d16dd5249a2a", "reference": "27467cfeca8fb2afd7ef3ffeea6d28a84f79df41",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -92,8 +92,8 @@
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"fastImageSize\\": "lib", "FastImageSize\\": "lib",
"fastImageSize\\tests\\": "tests" "FastImageSize\\tests\\": "tests"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -118,7 +118,7 @@
"php", "php",
"size" "size"
], ],
"time": "2015-04-09 11:19:59" "time": "2015-08-21 11:40:30"
}, },
{ {
"name": "patchwork/utf8", "name": "patchwork/utf8",

2
phpBB/config/default/container/services.yml
View file

@ -148,7 +148,7 @@ services:
- @mimetype.guesser - @mimetype.guesser
upload_imagesize: upload_imagesize:
class: fastImageSize\fastImageSize class: FastImageSize\FastImageSize
version_helper: version_helper:
class: phpbb\version_helper class: phpbb\version_helper

2
phpBB/includes/functions_upload.php
View file

@ -403,7 +403,7 @@ class filespec
$this->width = $this->height = 0; $this->width = $this->height = 0;
// Get imagesize class // Get imagesize class
$imagesize = new \fastImageSize\fastImageSize(); $imagesize = new \FastImageSize\FastImageSize();
$this->image_info = $imagesize->getImageSize($this->destination_file, $this->mimetype); $this->image_info = $imagesize->getImageSize($this->destination_file, $this->mimetype);

2
phpBB/includes/message_parser.php
View file

@ -403,7 +403,7 @@ class bbcode_firstpass extends bbcode
if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width']) 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)); $size_info = $imagesize->getImageSize(htmlspecialchars_decode($in));
if ($size_info === false) if ($size_info === false)

6
phpBB/phpbb/avatar/driver/driver.php
View file

@ -30,7 +30,7 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface
*/ */
protected $config; protected $config;
/** @var \fastImageSize\fastImageSize */ /** @var \FastImageSize\FastImageSize */
protected $imagesize; protected $imagesize;
/** /**
@ -76,13 +76,13 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface
* Construct a driver object * Construct a driver object
* *
* @param \phpbb\config\config $config phpBB configuration * @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 $phpbb_root_path Path to the phpBB root
* @param string $php_ext PHP file extension * @param string $php_ext PHP file extension
* @param \phpbb\path_helper $path_helper phpBB path helper * @param \phpbb\path_helper $path_helper phpBB path helper
* @param \phpbb\cache\driver\driver_interface $cache Cache driver * @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->config = $config;
$this->imagesize = $imagesize; $this->imagesize = $imagesize;

2
phpBB/phpbb/textformatter/s9e/parser.php
View file

@ -370,7 +370,7 @@ class parser implements \phpbb\textformatter\parser_interface
if ($max_height || $max_width) if ($max_height || $max_width)
{ {
$imagesize = new \fastImageSize\fastImageSize(); $imagesize = new \FastImageSize\FastImageSize();
$size_info = $imagesize->getImageSize($url); $size_info = $imagesize->getImageSize($url);
if ($size_info === false) if ($size_info === false)
{ {

2
tests/avatar/manager_test.php
View file

@ -57,7 +57,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
new \phpbb\mimetype\content_guesser, new \phpbb\mimetype\content_guesser,
); );
$guesser = new \phpbb\mimetype\guesser($guessers); $guesser = new \phpbb\mimetype\guesser($guessers);
$imagesize = new \fastImageSize\fastImageSize(); $imagesize = new \FastImageSize\FastImageSize();
$dispatcher = new phpbb_mock_event_dispatcher(); $dispatcher = new phpbb_mock_event_dispatcher();

4
tests/upload/imagesize_test.php
View file

@ -16,7 +16,7 @@ require_once(__DIR__ . '/../../phpBB/includes/functions.php');
class phpbb_upload_imagesize_test extends \phpbb_test_case class phpbb_upload_imagesize_test extends \phpbb_test_case
{ {
/** @var \fastImageSize\fastImageSize */ /** @var \FastImageSize\FastImageSize */
protected $imagesize; protected $imagesize;
/** @var string Path to fixtures */ /** @var string Path to fixtures */
@ -25,7 +25,7 @@ class phpbb_upload_imagesize_test extends \phpbb_test_case
public function setUp() public function setUp()
{ {
parent::setUp(); parent::setUp();
$this->imagesize = new \fastImageSize\fastImageSize(); $this->imagesize = new \FastImageSize\FastImageSize();
$this->path = __DIR__ . '/fixture/'; $this->path = __DIR__ . '/fixture/';
} }