all the properties and methods in Shopsys\FrameworkBundle\Twig namesp…

…ace has now protected instead of private visibility (#1114) - done to allow extensibility by inheritance - watched by Shopsys\CodingStandards\CsFixer\ForbiddenPrivateVisibilityFixer
shopsys · Jun 17, 2019 · 92fdc4d · 92fdc4d
1 parent c6f8bab
commit 92fdc4d
Show file tree

Hide file tree

Showing 28 changed files with 91 additions and 90 deletions.
diff --git a/packages/framework/easy-coding-standard.yml b/packages/framework/easy-coding-standard.yml
@@ -12,6 +12,7 @@ services:
                     - Shopsys\FrameworkBundle\Model
                     - Shopsys\FrameworkBundle\Component
                     - Shopsys\FrameworkBundle\Controller
+                    - Shopsys\FrameworkBundle\Twig
 
     Shopsys\CodingStandards\Sniffs\ConstantVisibilityRequiredSniff: ~
 

diff --git a/packages/framework/src/Twig/CookiesExtension.php b/packages/framework/src/Twig/CookiesExtension.php
@@ -10,7 +10,7 @@ class CookiesExtension extends \Twig_Extension
     /**
      * @var \Shopsys\FrameworkBundle\Model\Cookies\CookiesFacade
      */
-    private $cookiesFacade;
+    protected $cookiesFacade;
 
     /**
      * @param \Shopsys\FrameworkBundle\Model\Cookies\CookiesFacade $cookiesFacade

diff --git a/packages/framework/src/Twig/CssExtension.php b/packages/framework/src/Twig/CssExtension.php
@@ -10,7 +10,7 @@ class CssExtension extends \Twig_Extension
     /**
      * @var \Shopsys\FrameworkBundle\Component\Css\CssFacade
      */
-    private $cssFacade;
+    protected $cssFacade;
 
     /**
      * @param \Shopsys\FrameworkBundle\Component\Css\CssFacade $cssFacade

diff --git a/packages/framework/src/Twig/DateTimeFormatterExtension.php b/packages/framework/src/Twig/DateTimeFormatterExtension.php
@@ -14,12 +14,12 @@ class DateTimeFormatterExtension extends Twig_Extension
     /**
      * @var \Shopsys\FrameworkBundle\Component\Localization\DateTimeFormatter
      */
-    private $dateTimeFormatter;
+    protected $dateTimeFormatter;
 
     /**
      * @var \Shopsys\FrameworkBundle\Model\Localization\Localization
      */
-    private $localization;
+    protected $localization;
 
     /**
      * @param \Shopsys\FrameworkBundle\Component\Localization\DateTimeFormatter $dateTimeFormatter
@@ -119,7 +119,7 @@ public function formatDateTime($dateTime, $locale = null)
      * @param string|null $locale
      * @return string
      */
-    private function format($dateTime, $dateType, $timeType, $locale = null)
+    protected function format($dateTime, $dateType, $timeType, $locale = null)
     {
         if ($dateTime === null) {
             return '-';
@@ -137,7 +137,7 @@ private function format($dateTime, $dateType, $timeType, $locale = null)
      * @param string|null $locale
      * @return string
      */
-    private function getLocale($locale = null)
+    protected function getLocale($locale = null)
     {
         if ($locale === null) {
             $locale = $this->localization->getLocale();
@@ -150,7 +150,7 @@ private function getLocale($locale = null)
      * @param mixed $value
      * @return \DateTime
      */
-    private function convertToDateTime($value)
+    protected function convertToDateTime($value)
     {
         if ($value instanceof DateTime) {
             return $value;

diff --git a/packages/framework/src/Twig/DomainExtension.php b/packages/framework/src/Twig/DomainExtension.php
@@ -12,22 +12,22 @@ class DomainExtension extends \Twig_Extension
     /**
      * @var string
      */
-    private $domainImagesUrlPrefix;
+    protected $domainImagesUrlPrefix;
 
     /**
      * @var \Symfony\Component\Asset\Packages
      */
-    private $assetPackages;
+    protected $assetPackages;
 
     /**
      * @var \Shopsys\FrameworkBundle\Component\Domain\Domain
      */
-    private $domain;
+    protected $domain;
 
     /**
      * @var \Shopsys\FrameworkBundle\Component\Domain\DomainFacade
      */
-    private $domainFacade;
+    protected $domainFacade;
 
     /**
      * @param mixed $domainImagesUrlPrefix

diff --git a/packages/framework/src/Twig/FileThumbnail/FileThumbnailExtension.php b/packages/framework/src/Twig/FileThumbnail/FileThumbnailExtension.php
@@ -16,17 +16,17 @@ class FileThumbnailExtension extends Twig_Extension
     /**
      * @var string[]
      */
-    private $iconsByExtension;
+    protected $iconsByExtension;
 
     /**
      * @var \Shopsys\FrameworkBundle\Component\FileUpload\FileUpload
      */
-    private $fileUpload;
+    protected $fileUpload;
 
     /**
      * @var \Shopsys\FrameworkBundle\Component\Image\Processing\ImageThumbnailFactory
      */
-    private $imageThumbnailFactory;
+    protected $imageThumbnailFactory;
 
     /**
      * @param \Shopsys\FrameworkBundle\Component\FileUpload\FileUpload $fileUpload
@@ -98,7 +98,7 @@ public function getFileThumbnailInfoByTemporaryFilename($temporaryFilename)
      * @param string $filepath
      * @return \Shopsys\FrameworkBundle\Twig\FileThumbnail\FileThumbnailInfo
      */
-    private function getImageThumbnailInfo($filepath)
+    protected function getImageThumbnailInfo($filepath)
     {
         $image = $this->imageThumbnailFactory->getImageThumbnail($filepath);
 
@@ -109,7 +109,7 @@ private function getImageThumbnailInfo($filepath)
      * @param string $filepath
      * @return string
      */
-    private function getIconTypeByFilename($filepath)
+    protected function getIconTypeByFilename($filepath)
     {
         $extension = strtolower(pathinfo($filepath, PATHINFO_EXTENSION));
         if (array_key_exists($extension, $this->iconsByExtension)) {

diff --git a/packages/framework/src/Twig/FileThumbnail/FileThumbnailInfo.php b/packages/framework/src/Twig/FileThumbnail/FileThumbnailInfo.php
@@ -7,12 +7,12 @@ class FileThumbnailInfo
     /**
      * @var string|null
      */
-    private $iconType;
+    protected $iconType;
 
     /**
      * @var string|null
      */
-    private $imageUri;
+    protected $imageUri;
 
     /**
      * @param string|null $iconType

diff --git a/packages/framework/src/Twig/FileUploadExtension.php b/packages/framework/src/Twig/FileUploadExtension.php
@@ -11,7 +11,7 @@ class FileUploadExtension extends Twig_Extension
     /**
      * @var \Shopsys\FrameworkBundle\Component\FileUpload\FileUpload
      */
-    private $fileUpload;
+    protected $fileUpload;
 
     /**
      * @param \Shopsys\FrameworkBundle\Component\FileUpload\FileUpload $fileUpload

diff --git a/packages/framework/src/Twig/FormDetailExtension.php b/packages/framework/src/Twig/FormDetailExtension.php
@@ -12,7 +12,7 @@ class FormDetailExtension extends Twig_Extension
     /**
      * @var \Twig_Environment
      */
-    private $twigEnvironment;
+    protected $twigEnvironment;
 
     /**
      * @param \Twig_Environment $twigEnvironment

diff --git a/packages/framework/src/Twig/FormThemeExtension.php b/packages/framework/src/Twig/FormThemeExtension.php
@@ -54,7 +54,7 @@ public function getDefaultFormTheme()
      * @param string $controller
      * @return bool
      */
-    private function isAdmin(string $controller) : bool
+    protected function isAdmin(string $controller) : bool
     {
         return strpos($controller, 'Shopsys\FrameworkBundle\Controller\Admin') === 0 ||
             strpos($controller, 'Shopsys\ShopBundle\Controller\Admin') === 0;

diff --git a/packages/framework/src/Twig/HoneyPotExtension.php b/packages/framework/src/Twig/HoneyPotExtension.php
@@ -48,7 +48,7 @@ public function formHoneyPotCheckPasswordAlreadyRendered(FormView $formView)
      * @param \Symfony\Component\Form\FormView $formView
      * @return \Symfony\Component\Form\FormView
      */
-    private function getRootFormView(FormView $formView)
+    protected function getRootFormView(FormView $formView)
     {
         $rootFormView = $formView;
 
@@ -63,7 +63,7 @@ private function getRootFormView(FormView $formView)
      * @param \Symfony\Component\Form\FormView $formView
      * @return bool
      */
-    private function containsNotRenderedPassword(FormView $formView)
+    protected function containsNotRenderedPassword(FormView $formView)
     {
         foreach ($formView->children as $childForm) {
             if (strpos($childForm->vars['name'], static::PASSWORD_FIELD_NAME) !== false && !$childForm->isRendered()) {

diff --git a/packages/framework/src/Twig/ImageExtension.php b/packages/framework/src/Twig/ImageExtension.php
@@ -20,7 +20,7 @@ class ImageExtension extends Twig_Extension
     /**
      * @var string
      */
-    private $frontDesignImageUrlPrefix;
+    protected $frontDesignImageUrlPrefix;
 
     /**
      * @var \Shopsys\FrameworkBundle\Component\Domain\Domain
@@ -30,7 +30,7 @@ class ImageExtension extends Twig_Extension
     /**
      * @var \Shopsys\FrameworkBundle\Component\Image\ImageLocator
      */
-    private $imageLocator;
+    protected $imageLocator;
 
     /**
      * @var \Shopsys\FrameworkBundle\Component\Image\ImageFacade
@@ -40,7 +40,7 @@ class ImageExtension extends Twig_Extension
     /**
      * @var \Symfony\Component\Templating\EngineInterface
      */
-    private $templating;
+    protected $templating;
 
     /**
      * @param string $frontDesignImageUrlPrefix
@@ -157,7 +157,7 @@ public function getNoimageHtml(array $attributes = [])
     /**
      * @return string
      */
-    private function getEmptyImageUrl(): string
+    protected function getEmptyImageUrl(): string
     {
         return $this->domain->getUrl() . $this->frontDesignImageUrlPrefix . '/' . static::NOIMAGE_FILENAME;
     }
@@ -168,7 +168,7 @@ private function getEmptyImageUrl(): string
      * @param string|null $sizeName
      * @return string
      */
-    private function getImageCssClass($entityName, $type, $sizeName)
+    protected function getImageCssClass($entityName, $type, $sizeName)
     {
         $allClassParts = [
             'image',

diff --git a/packages/framework/src/Twig/InputPriceLabelExtension.php b/packages/framework/src/Twig/InputPriceLabelExtension.php
@@ -11,7 +11,7 @@ class InputPriceLabelExtension extends Twig_Extension
     /**
      * @var \Shopsys\FrameworkBundle\Model\Pricing\PricingSetting
      */
-    private $pricingSetting;
+    protected $pricingSetting;
 
     /**
      * @param \Shopsys\FrameworkBundle\Model\Pricing\PricingSetting $pricingSetting