Merge pull request #378 from mageplaza/2.4-develop

2.4 develop

Author: chuccv

Api/Data/SearchResult/CategorySearchResultInterface.php

@@ -38,5 +38,5 @@ public function getItems();
      * @param \Mageplaza\Blog\Api\Data\CategoryInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(?array $items = null);
 }

Api/Data/SearchResult/CommentSearchResultInterface.php

@@ -38,5 +38,5 @@ public function getItems();
      * @param \Mageplaza\Blog\Api\Data\CommentInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(?array $items = null);
 }

Api/Data/SearchResult/PostSearchResultInterface.php

@@ -38,5 +38,5 @@ public function getItems();
      * @param \Mageplaza\Blog\Api\Data\PostInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(?array $items = null);
 }

Api/Data/SearchResult/TagSearchResultInterface.php

@@ -38,5 +38,5 @@ public function getItems();
      * @param \Mageplaza\Blog\Api\Data\TagInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(?array $items = null);
 }

Api/Data/SearchResult/TopicSearchResultInterface.php

@@ -38,5 +38,5 @@ public function getItems();
      * @param \Mageplaza\Blog\Api\Data\TopicInterface[] $items
      * @return $this
      */
-    public function setItems(array $items = null);
+    public function setItems(?array $items = null);
 }

Model/Author.php

@@ -60,8 +60,8 @@ public function __construct(
         Context $context,
         Registry $registry,
         Data $helperData,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->helperData = $helperData;

Model/Category.php

@@ -138,8 +138,8 @@ public function __construct(
         CategoryFactory $categoryFactory,
         CollectionFactory $postCollectionFactory,
         CategoryCollectionFactory $categoryCollectionFactory,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->categoryFactory = $categoryFactory;

Model/Comment.php

@@ -89,8 +89,8 @@ public function __construct(
         Registry $registry,
         CollectionFactory $postCollectionFactory,
         CommentCollectionFactory $commentCollectionFactory,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->postCollectionFactory = $postCollectionFactory;

Model/Import/AbstractImport.php

@@ -195,8 +195,8 @@ public function __construct(
         HelperData $helperData,
         StoreManagerInterface $storeManager,
         HelperImage $helperImage,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->date                = $date;

Model/Post.php

@@ -243,8 +243,8 @@ public function __construct(
         CategoryCollectionFactory $categoryCollectionFactory,
         PostCollectionFactory $postCollectionFactory,
         ProductCollectionFactory $productCollectionFactory,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->tagCollectionFactory      = $tagCollectionFactory;

Model/ResourceModel/PostHistory/Collection.php

@@ -71,8 +71,8 @@ public function __construct(
         LoggerInterface $logger,
         FetchStrategyInterface $fetchStrategy,
         ManagerInterface $eventManager,
-        AdapterInterface $connection = null,
-        AbstractDb $resource = null
+        ?AdapterInterface $connection = null,
+        ?AbstractDb $resource = null
     ) {
         $this->localeDate = $localeDate;
         $this->locale = $localeResolver->getLocale();

Model/Tag.php

@@ -106,8 +106,8 @@ public function __construct(
         Registry $registry,
         CollectionFactory $postCollectionFactory,
         TagCollectionFactory $tagCollectionFactory,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->postCollectionFactory = $postCollectionFactory;

Model/Topic.php

@@ -118,8 +118,8 @@ public function __construct(
         Registry $registry,
         CollectionFactory $postCollectionFactory,
         TopicCollectionFactory $topicCollectionFactory,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->postCollectionFactory = $postCollectionFactory;

composer.json

@@ -2,11 +2,11 @@
   "name": "mageplaza/magento-2-blog-extension",
   "description": "Magento 2 Blog extension",
   "require": {
-    "mageplaza/module-core": "^1.5.10",
-    "mageplaza/facebook-graph-sdk": "^1.0.1"
+    "mageplaza/module-core": "^1.5.13",
+    "mageplaza/facebook-graph-sdk": "^1.0.2"
   },
   "type": "magento2-module",
-  "version": "4.2.7",
+  "version": "4.2.8",
   "license": "proprietary",
   "keywords": [
     "magento 2",

view/adminhtml/web/category/edit.js

@@ -19,46 +19,17 @@
  */
 
 define([
-    'jquery',
-    'prototype',
-    'extjs/ext-tree-checkbox'
+    'jquery'
 ], function (jQuery) {
 
-    var categorySubmit = function (url, useAjax) {
+    var categorySubmit = function () {
         var activeTab = $('active_tab_id');
         if (activeTab) {
             if (activeTab.tabsJsObject && activeTab.tabsJsObject.tabs('activeAnchor')) {
                 activeTab.value = activeTab.tabsJsObject.tabs('activeAnchor').prop('id');
             }
         }
 
-        var params = {};
-        var fields = $('category_edit_form').getElementsBySelector('input', 'select');
-        for (var i = 0; i < fields.length; i++) {
-            if (!fields[i].name) {
-                continue;
-            }
-            params[fields[i].name] = fields[i].getValue();
-        }
-
-        // Get info about what we're submitting - to properly update tree nodes
-        var categoryId = params['category[id]'] ? params['category[id]'] : 0;
-        var isCreating = categoryId == 0; // Separate variable is needed because '0' in javascript converts to TRUE
-        var path = params['category[path]'].split('/');
-        var parentId = path.pop();
-        if (parentId == categoryId) { // Maybe path includes Blog Category id itself
-            parentId = path.pop();
-        }
-
-        // Make operations with Blog Category tree
-        if (isCreating) {
-            if (!Ext.tree.currentNodeId) {
-                // First submit of form - select some node to be current
-                Ext.tree.currentNodeId = parentId;
-            }
-            Ext.tree.addNodeTo = parentId;
-        }
-
         // Submit form
         jQuery('#category_edit_form').trigger('submit');
     };