Merge branch 'development' into staging

pfeiferbit · Jul 28, 2016 · f9e9ab5 · f9e9ab5
2 parents 9e6e313 + cdbc6aa
commit f9e9ab5
Show file tree

Hide file tree

Showing 10 changed files with 1,218 additions and 30,341 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # VHS Change log
 
+3.0.1 - 2016-07-29
+------------------
+
+- [#1067](https://github.com/FluidTYPO3/vhs/pull/1067) Argument `subject` on `v:format.preg.replace` made optional to allow usage with tag content / inline
+- [#1068](https://github.com/FluidTYPO3/vhs/pull/1068) Page-related ViewHelpers operable in backend context
+- [#1073](https://github.com/FluidTYPO3/vhs/pull/1073) Bug fix to show sub menus with single item on root level pages
+- [#1074](https://github.com/FluidTYPO3/vhs/pull/1074) Bug fix to remove unintentionally shown pages from menus
+- [#1077](https://github.com/FluidTYPO3/vhs/pull/1077) Added `JSON_HEX_APOS` to default JSON encoding parameters in `v:format.json.encode`
+
+
 3.0.0 - 2016-07-12
 ------------------
 

diff --git a/Classes/Service/PageService.php b/Classes/Service/PageService.php
@@ -41,6 +41,11 @@ class PageService implements SingletonInterface
      */
     protected static $cachedRootlines = [];
 
+    /**
+     * @var PageRepository
+     */
+    protected static $backendPageRepository;
+
     /**
      * @param integer $pageUid
      * @param array $excludePages
@@ -172,7 +177,7 @@ public function hidePageForLanguageUid($page = null, $languageUid = -1, $normalW
         $hideIfDefaultLanguage = (boolean) GeneralUtility::hideIfDefaultLanguage($l18nCfg);
         $pageOverlay = [];
         if (0 !== $languageUid) {
-            $pageOverlay¨ = $GLOBALS['TSFE']->sys_page->getPageOverlay($pageUid, $languageUid);
+            $pageOverlay = $GLOBALS['TSFE']->sys_page->getPageOverlay($pageUid, $languageUid);
         }
         $translationAvailable = (0 !== count($pageOverlay));
 
@@ -187,9 +192,23 @@ public function hidePageForLanguageUid($page = null, $languageUid = -1, $normalW
      */
     protected function getPageRepository()
     {
+        if (TYPO3_MODE === 'BE') {
+            return $this->getPageRepositoryForBackendContext();
+        }
         return clone $GLOBALS['TSFE']->sys_page;
     }
 
+    /**
+     * @return PageRepository
+     */
+    protected function getPageRepositoryForBackendContext()
+    {
+        if (static::$backendPageRepository === null) {
+            static::$backendPageRepository = GeneralUtility::makeInstance(PageRepository::class);
+        }
+        return static::$backendPageRepository;
+    }
+
     /**
      * @param array $page
      * @param boolean $forceAbsoluteUrl

diff --git a/Classes/ViewHelpers/Content/InfoViewHelper.php b/Classes/ViewHelpers/Content/InfoViewHelper.php
@@ -109,6 +109,5 @@ public function render()
         }
 
         return $this->renderChildrenWithVariableOrReturnInput($content);
-
     }
 }
diff --git a/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php b/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php
@@ -103,7 +103,7 @@ protected function encodeValue($value, $useTraversableKeys, $preventRecursion, $
             $value = $this->recursiveArrayOfDomainObjectsToArray($value, $preventRecursion, $recursionMarker);
             $value = $this->recursiveDateTimeToUnixtimeMiliseconds($value, $dateTimeFormat);
         };
-        $json = json_encode($value, JSON_HEX_AMP | JSON_HEX_QUOT | JSON_HEX_TAG);
+        $json = json_encode($value, JSON_HEX_AMP | JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw new Exception('The provided argument cannot be converted into JSON.', 1358440181);
         }

diff --git a/Classes/ViewHelpers/Format/PregReplaceViewHelper.php b/Classes/ViewHelpers/Format/PregReplaceViewHelper.php
@@ -31,7 +31,7 @@ public function initializeArguments()
     {
         $this->registerAsArgument();
         $this->registerArgument('pattern', 'string', 'Regex pattern to match against', true);
-        $this->registerArgument('subject', 'string', 'String to match with the regex pattern or patterns', true);
+        $this->registerArgument('subject', 'string', 'String to match with the regex pattern or patterns');
         $this->registerArgument('replacement', 'string', 'String to replace matches with', true);
     }
 

diff --git a/Classes/ViewHelpers/Format/SanitizeStringViewHelper.php b/Classes/ViewHelpers/Format/SanitizeStringViewHelper.php
@@ -158,6 +158,5 @@ public static function renderStatic(
         $pattern = '/([^a-z0-9\-]){1,}/';
         $string = preg_replace($pattern, '-', $string);
         return trim($string, '-');
-
     }
 }
diff --git a/Classes/ViewHelpers/Menu/AbstractMenuViewHelper.php b/Classes/ViewHelpers/Menu/AbstractMenuViewHelper.php
@@ -381,14 +381,14 @@ protected function renderItemLink(array $page)
     /**
      * @param null|integer $pageUid
      * @param integer $entryLevel
-     * @return integer
+     * @return null|integer
      */
-    protected function determinePageUid($pageUid = null, $entryLevel = 0)
+    protected function determineParentPageUid($pageUid = null, $entryLevel = 0)
     {
         $rootLineData = $this->pageService->getRootLine();
         if (null === $pageUid) {
             if (null !== $entryLevel) {
-                if (0 > $entryLevel) {
+                if ($entryLevel < 0) {
                     $entryLevel = count($rootLineData) - 1 + $entryLevel;
                 }
                 $pageUid = $rootLineData[$entryLevel]['uid'];
@@ -397,18 +397,20 @@ protected function determinePageUid($pageUid = null, $entryLevel = 0)
             }
         }
 
-        return (integer) $pageUid;
+        return $pageUid;
     }
 
     /**
      * @param null|integer $pageUid
      * @param integer $entryLevel
-     *
      * @return array
      */
     public function getMenu($pageUid = null, $entryLevel = 0)
     {
-        $pageUid = $this->determinePageUid($pageUid, $entryLevel);
+        $pageUid = $this->determineParentPageUid($pageUid, $entryLevel);
+        if ($pageUid === null) {
+            return [];
+        }
         $showHiddenInMenu = (boolean) $this->arguments['showHiddenInMenu'];
         $showAccessProtected = (boolean) $this->arguments['showAccessProtected'];
         $includeSpacers = (boolean) $this->arguments['includeSpacers'];
@@ -432,6 +434,7 @@ public function parseMenu(array $pages)
         $count = 0;
         $total = count($pages);
         $allowedDocumentTypes = $this->allowedDoktypeList();
+        $processedPages = [];
         foreach ($pages as $index => $page) {
             if (!in_array($page['doktype'], $allowedDocumentTypes)) {
                 continue;
@@ -487,9 +490,10 @@ public function parseMenu(array $pages)
             $pages[$index]['linktext'] = $this->getItemTitle($pages[$index]);
             $forceAbsoluteUrl = $this->arguments['forceAbsoluteUrl'];
             $pages[$index]['link'] = $this->pageService->getItemLink($page, $forceAbsoluteUrl);
+            $processedPages[$index] = $pages[$index];
         }
 
-        return $pages;
+        return $processedPages;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,6 +109,5 @@ public function render() @@
             }
             return $this->renderChildrenWithVariableOrReturnInput($content);
         }
     }