Merge pull request #1 from namnguyenthanhwork/master

fix strict type, add Laminas and remove Zend
boolfly · Aug 2, 2023 · dcff75a · dcff75a
2 parents 6a7b108 + 58073df
commit dcff75a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/Block/PostContent.php b/Block/PostContent.php
@@ -24,8 +24,8 @@
 use Magento\Framework\Registry;
 use Magento\Framework\View\Element\Template;
 use Zend_Db_Select;
-use Zend_Filter_Exception;
-use Zend_Filter_Interface;
+use Laminas\Filter\Exception as FilterException;
+use Laminas\Filter\FilterInterface as LaminasFilter;
 
 class PostContent extends AbstractBlock
 {
@@ -38,7 +38,7 @@ class PostContent extends AbstractBlock
     protected $postFactory;
 
     /**
-     * @var Zend_Filter_Interface
+     * @var LaminasFilter
      */
     protected $templateProcessor;
 
@@ -81,7 +81,7 @@ class PostContent extends AbstractBlock
      * View constructor.
      * @param Template\Context $context
      * @param PostFactory $postFactory
-     * @param Zend_Filter_Interface $templateProcessor
+     * @param LaminasFilter $templateProcessor
      * @param Config $config
      * @param Registry $registry
      * @param \Magento\Framework\View\Page\Config $pageConfig
@@ -97,7 +97,7 @@ class PostContent extends AbstractBlock
     public function __construct(
         Template\Context $context,
         PostFactory $postFactory,
-        Zend_Filter_Interface $templateProcessor,
+        LaminasFilter $templateProcessor,
         Config $config,
         Registry $registry,
         \Magento\Framework\View\Page\Config $pageConfig,
@@ -215,7 +215,7 @@ public function getTags()
     /**
      * @param $string
      * @return mixed
-     * @throws Zend_Filter_Exception
+     * @throws FilterException
      */
     public function filterOutputHtml($string)
     {

diff --git a/Model/ImageUploader.php b/Model/ImageUploader.php
@@ -61,10 +61,10 @@ public function __construct(
         DateTime $date,
         Random $random,
         LoggerInterface $logger,
-        $baseTmpPath,
-        $basePath,
-        $allowedExtensions,
-        $allowedMimeTypes = []
+        string $baseTmpPath,
+        string $basePath,
+        array $allowedExtensions,
+        array $allowedMimeTypes = []
     ) {
         parent::__construct(
             $coreFileStorageDatabase,

diff --git a/Ui/DataProvider/AuthorDataProvider.php b/Ui/DataProvider/AuthorDataProvider.php
@@ -43,9 +43,9 @@ class AuthorDataProvider extends AbstractDataProvider
      * @param array $data
      */
     public function __construct(
-        $name,
-        $primaryFieldName,
-        $requestFieldName,
+        string $name,
+        string $primaryFieldName,
+        string $requestFieldName,
         File $fileInfo,
         CollectionFactory $collectionFactory,
         DataPersistorInterface $dataPersistor,

diff --git a/Ui/DataProvider/CategoryDataProvider.php b/Ui/DataProvider/CategoryDataProvider.php
@@ -42,9 +42,9 @@ class CategoryDataProvider extends AbstractDataProvider
      * @param array $data
      */
     public function __construct(
-        $name,
-        $primaryFieldName,
-        $requestFieldName,
+        string $name,
+        string $primaryFieldName,
+        string $requestFieldName,
         CollectionFactory $collectionFactory,
         DataPersistorInterface $dataPersistor,
         Registry $coreRegistry,

diff --git a/Ui/DataProvider/PostDataProvider.php b/Ui/DataProvider/PostDataProvider.php
@@ -67,9 +67,9 @@ class PostDataProvider extends AbstractDataProvider
      * @param array $data
      */
     public function __construct(
-        $name,
-        $primaryFieldName,
-        $requestFieldName,
+        string $name,
+        string $primaryFieldName,
+        string $requestFieldName,
         Registry $coreRegistry,
         File $fileInfo,
         CollectionFactory $collectionFactory,

diff --git a/Ui/DataProvider/TagDataProvider.php b/Ui/DataProvider/TagDataProvider.php
@@ -35,9 +35,9 @@ class TagDataProvider extends AbstractDataProvider
      * @param array $data
      */
     public function __construct(
-        $name,
-        $primaryFieldName,
-        $requestFieldName,
+        string $name,
+        string $primaryFieldName,
+        string $requestFieldName,
         DataPersistorInterface $dataPersistor,
         CollectionFactory $collectionFactory,
         array $meta = [],