Merge branch '7.3'

ezpublishlegacy · Dec 13, 2018 · 05264ee · 05264ee
2 parents 1200ea2 + 4cc037c
commit 05264ee
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/eZ/Publish/Core/FieldType/Tests/StringLengthValidatorTest.php b/eZ/Publish/Core/FieldType/Tests/StringLengthValidatorTest.php
@@ -217,14 +217,14 @@ public function providerForValidateKO()
         return array(
             array(
                 '',
-                'The string can not be shorter than %size% character.',
-                'The string can not be shorter than %size% characters.',
+                'The string cannot be shorter than %size% character.',
+                'The string cannot be shorter than %size% characters.',
                 array('%size%' => $this->getMinStringLength()),
             ),
             array(
                 'Hi!',
-                'The string can not be shorter than %size% character.',
-                'The string can not be shorter than %size% characters.',
+                'The string cannot be shorter than %size% character.',
+                'The string cannot be shorter than %size% characters.',
                 array('%size%' => $this->getMinStringLength()),
             ),
             array(
@@ -235,8 +235,8 @@ public function providerForValidateKO()
             ),
             array(
                 'ABC♔',
-                'The string can not be shorter than %size% character.',
-                'The string can not be shorter than %size% characters.',
+                'The string cannot be shorter than %size% character.',
+                'The string cannot be shorter than %size% characters.',
                 array('%size%' => $this->getMinStringLength()),
             ),
         );

diff --git a/eZ/Publish/Core/FieldType/Tests/TextLineTest.php b/eZ/Publish/Core/FieldType/Tests/TextLineTest.php
@@ -637,8 +637,8 @@ public function provideInvalidDataForValidate()
                 new TextLineValue('aaa'),
                 array(
                     new ValidationError(
-                        'The string can not be shorter than %size% character.',
-                        'The string can not be shorter than %size% characters.',
+                        'The string cannot be shorter than %size% character.',
+                        'The string cannot be shorter than %size% characters.',
                         array(
                             '%size%' => 5,
                         ),
@@ -687,8 +687,8 @@ public function provideInvalidDataForValidate()
                         'text'
                     ),
                     new ValidationError(
-                        'The string can not be shorter than %size% character.',
-                        'The string can not be shorter than %size% characters.',
+                        'The string cannot be shorter than %size% character.',
+                        'The string cannot be shorter than %size% characters.',
                         array(
                             '%size%' => 10,
                         ),
@@ -708,8 +708,8 @@ public function provideInvalidDataForValidate()
                 new TextLineValue('ABC♔'),
                 array(
                     new ValidationError(
-                        'The string can not be shorter than %size% character.',
-                        'The string can not be shorter than %size% characters.',
+                        'The string cannot be shorter than %size% character.',
+                        'The string cannot be shorter than %size% characters.',
                         array(
                             '%size%' => 5,
                         ),

diff --git a/eZ/Publish/Core/FieldType/TextLine/Type.php b/eZ/Publish/Core/FieldType/TextLine/Type.php
@@ -107,8 +107,8 @@ public function validate(FieldDefinition $fieldDefinition, SPIValue $fieldValue)
             $constraints['minStringLength'] !== 0 &&
             mb_strlen($fieldValue->text) < $constraints['minStringLength']) {
             $validationErrors[] = new ValidationError(
-                'The string can not be shorter than %size% character.',
-                'The string can not be shorter than %size% characters.',
+                'The string cannot be shorter than %size% character.',
+                'The string cannot be shorter than %size% characters.',
                 array(
                     '%size%' => $constraints['minStringLength'],
                 ),

diff --git a/eZ/Publish/Core/FieldType/Validator/StringLengthValidator.php b/eZ/Publish/Core/FieldType/Validator/StringLengthValidator.php
@@ -126,8 +126,8 @@ public function validate(BaseValue $value)
             $this->constraints['minStringLength'] !== 0 &&
             mb_strlen($value->text) < $this->constraints['minStringLength']) {
             $this->errors[] = new ValidationError(
-                'The string can not be shorter than %size% character.',
-                'The string can not be shorter than %size% characters.',
+                'The string cannot be shorter than %size% character.',
+                'The string cannot be shorter than %size% characters.',
                 array(
                     '%size%' => $this->constraints['minStringLength'],
                 )

diff --git a/eZ/Publish/Core/MVC/Symfony/Routing/Generator/UrlAliasGenerator.php b/eZ/Publish/Core/MVC/Symfony/Routing/Generator/UrlAliasGenerator.php
@@ -114,7 +114,7 @@ public function doGenerate($location, array $parameters)
             if ($rootLocationId !== null) {
                 $pathPrefix = $this->getPathPrefixByRootLocationId($rootLocationId, $languages, $siteaccess);
                 // "/" cannot be considered as a path prefix since it's root, so we ignore it.
-                if ($pathPrefix !== '/' && mb_stripos($path, $pathPrefix) === 0) {
+                if ($pathPrefix !== '/' && ($path === $pathPrefix || mb_stripos($path, $pathPrefix . '/') === 0)) {
                     $path = mb_substr($path, mb_strlen($pathPrefix));
                 } elseif ($pathPrefix !== '/' && !$this->isUriPrefixExcluded($path) && $this->logger !== null) {
                     // Location path is outside configured content tree and doesn't have an excluded prefix.

diff --git a/eZ/Publish/Core/MVC/Symfony/Routing/Tests/UrlAliasGeneratorTest.php b/eZ/Publish/Core/MVC/Symfony/Routing/Tests/UrlAliasGeneratorTest.php
@@ -427,6 +427,12 @@ public function providerTestDoGenerateRootLocation()
                 '/shared/some-content',
                 '/my/root-folder',
             ),
+            array(
+                new UrlAlias(array('path' => '/products/ez-publish')),
+                false,
+                '/products/ez-publish',
+                '/prod',
+            ),
         );
     }