-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement image source parser #10864
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
<?php | ||
/** | ||
* 2007-2018 PrestaShop. | ||
* | ||
* NOTICE OF LICENSE | ||
* | ||
* This source file is subject to the Open Software License (OSL 3.0) | ||
* that is bundled with this package in the file LICENSE.txt. | ||
* It is also available through the world-wide-web at this URL: | ||
* https://opensource.org/licenses/OSL-3.0 | ||
* If you did not receive a copy of the license and are unable to | ||
* obtain it through the world-wide-web, please send an email | ||
* to license@prestashop.com so we can send you a copy immediately. | ||
* | ||
* DISCLAIMER | ||
* | ||
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer | ||
* versions in the future. If you wish to customize PrestaShop for your | ||
* needs please refer to http://www.prestashop.com for more information. | ||
* | ||
* @author PrestaShop SA <contact@prestashop.com> | ||
* @copyright 2007-2018 PrestaShop SA | ||
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) | ||
* International Registered Trademark & Property of PrestaShop SA | ||
*/ | ||
|
||
namespace PrestaShop\PrestaShop\Core\Image\Parser; | ||
|
||
/** | ||
* Class ImageTagPathParser parses "src" attribute of given image tag and prefixed it with shop's uri. | ||
* | ||
* This service helps retrieving image path from image tag generated by legacy ImageManager::thumbnail() method | ||
* so image can be displayed in new pages. | ||
*/ | ||
final class ImageTagSourceParser implements ImageTagSourceParserInterface | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private $shopRootUri; | ||
|
||
/** | ||
* @param string $shopRootUri | ||
*/ | ||
public function __construct($shopRootUri) | ||
{ | ||
$this->shopRootUri = $shopRootUri; | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public function parse($imageTag) | ||
{ | ||
$replacement = 'src="/'; | ||
$imageTag = preg_replace('/src="(\.\.\/|\.\/)+/', $replacement, $imageTag); | ||
|
||
if (null === $imageTag) { | ||
return null; | ||
} | ||
|
||
preg_match('/src="([^"]+)"/', $imageTag, $path); | ||
|
||
if (empty($path[1])) { | ||
return null; | ||
} | ||
|
||
return sprintf('%s%s', $this->shopRootUri, $path[1]); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
<?php | ||
/** | ||
* 2007-2018 PrestaShop. | ||
* | ||
* NOTICE OF LICENSE | ||
* | ||
* This source file is subject to the Open Software License (OSL 3.0) | ||
* that is bundled with this package in the file LICENSE.txt. | ||
* It is also available through the world-wide-web at this URL: | ||
* https://opensource.org/licenses/OSL-3.0 | ||
* If you did not receive a copy of the license and are unable to | ||
* obtain it through the world-wide-web, please send an email | ||
* to license@prestashop.com so we can send you a copy immediately. | ||
* | ||
* DISCLAIMER | ||
* | ||
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer | ||
* versions in the future. If you wish to customize PrestaShop for your | ||
* needs please refer to http://www.prestashop.com for more information. | ||
* | ||
* @author PrestaShop SA <contact@prestashop.com> | ||
* @copyright 2007-2018 PrestaShop SA | ||
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) | ||
* International Registered Trademark & Property of PrestaShop SA | ||
*/ | ||
|
||
namespace PrestaShop\PrestaShop\Core\Image\Parser; | ||
|
||
/** | ||
* Interface ImageTagSourceParserInterface is contract for image "src" attribute parser. | ||
*/ | ||
interface ImageTagSourceParserInterface | ||
{ | ||
/** | ||
* @param string $imageTag Example '<img src="..path/to/image.jpg">' | ||
* | ||
* @return string Parsed "src" attribute | ||
*/ | ||
public function parse($imageTag); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
<?php | ||
/** | ||
* 2007-2018 PrestaShop | ||
* | ||
* NOTICE OF LICENSE | ||
* | ||
* This source file is subject to the Open Software License (OSL 3.0) | ||
* that is bundled with this package in the file LICENSE.txt. | ||
* It is also available through the world-wide-web at this URL: | ||
* https://opensource.org/licenses/OSL-3.0 | ||
* If you did not receive a copy of the license and are unable to | ||
* obtain it through the world-wide-web, please send an email | ||
* to license@prestashop.com so we can send you a copy immediately. | ||
* | ||
* DISCLAIMER | ||
* | ||
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer | ||
* versions in the future. If you wish to customize PrestaShop for your | ||
* needs please refer to http://www.prestashop.com for more information. | ||
* | ||
* @author PrestaShop SA <contact@prestashop.com> | ||
* @copyright 2007-2018 PrestaShop SA | ||
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) | ||
* International Registered Trademark & Property of PrestaShop SA | ||
*/ | ||
|
||
namespace Tests\Unit\Core\Image\Parser; | ||
|
||
use PHPUnit\Framework\TestCase; | ||
use PrestaShop\PrestaShop\Core\Image\Parser\ImageTagSourceParser; | ||
|
||
class ImageTagSourceParserTest extends TestCase | ||
{ | ||
/** | ||
* @var ImageTagSourceParser | ||
*/ | ||
private $parser; | ||
|
||
public function setUp() | ||
{ | ||
$this->parser = new ImageTagSourceParser('/my-shop'); | ||
} | ||
/** | ||
* @dataProvider getTestCases | ||
*/ | ||
public function testItParsesSourceAsExpected($imageTag, $expectedSource) | ||
{ | ||
$parsedSource = $this->parser->parse($imageTag); | ||
$this->assertSame($expectedSource, $parsedSource); | ||
} | ||
public function getTestCases() | ||
{ | ||
return [ | ||
[ | ||
'<img src="/path/to/my_image.jpg">', | ||
'/my-shop/path/to/my_image.jpg', | ||
], | ||
[ | ||
'<img src="../path/to/my_image.jpg">', | ||
'/my-shop/path/to/my_image.jpg', | ||
], | ||
[ | ||
'<img class="test" src="../path/to/my_image.jpg" alt="some alt text">', | ||
'/my-shop/path/to/my_image.jpg', | ||
], | ||
[ | ||
'<img class="test" src="../path/to/my_image.jpg?time=123" alt="some alt text">', | ||
'/my-shop/path/to/my_image.jpg?time=123', | ||
], | ||
[ | ||
'<img class="test" src="../.././path/to/my_image.jpg?time=123" alt="some alt text">', | ||
'/my-shop/path/to/my_image.jpg?time=123', | ||
], | ||
[ | ||
'<img class="test" src="../../../../../../../path/to/my_image.jpg?time=123" alt="some alt text">', | ||
'/my-shop/path/to/my_image.jpg?time=123', | ||
], | ||
[ | ||
'<img class="test" src="./../../../path/to/my_image.jpg?time=123" alt="some alt text">', | ||
'/my-shop/path/to/my_image.jpg?time=123', | ||
], | ||
[ | ||
'<img class="test">', | ||
null, | ||
], | ||
[ | ||
'random string', | ||
null, | ||
], | ||
[ | ||
'<img class="">', | ||
null, | ||
], | ||
]; | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what about testing
../../../../../../../
../.././
./../../../
Ok it's weird but can happened :P
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ohh you evil man, you made me update regex again... :p
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can help you, I love regex.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i've updated it, you may check it out. :)