Merge pull request #1184 from algolia/develop

Merge develop into master for v3.3.0 release.

Author: rakesh-algolia

.circleci/config.yml

@@ -70,7 +70,7 @@ jobs:
 
     "quality-tools":
         docker:
-            - image: algolia/magento2-circleci:v3-2.3.5-p2
+            - image: algolia/magento2-circleci:2.4.4-php7.4-v1
         working_directory: ~/build_directory/algoliasearch-magento-2
         steps:
             - checkout
@@ -92,8 +92,8 @@ jobs:
                       composer global require algolia/magento2-tools
 
                       # We have to do this again because we restore the cache above, overwriting the vendor with the original.
-                      cd ~/magento_directory/vendor/algolia
-                      rm -rf algoliasearch-magento-2
+                      mkdir ~/magento_directory/vendor/algolia
+                      # rm -rf algoliasearch-magento-2
                       cp -R ~/build_directory/algoliasearch-magento-2 ~/magento_directory/vendor/algolia
                       cd ~/magento_directory
                       composer dump-autoload

.github/release.yml

@@ -0,0 +1,18 @@
+# .github/release.yml
+
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - Semver-Major
+        - breaking-change
+    - title: New Features 🎉
+      labels:
+        - Semver-Minor
+        - enhancement
+    - title: Bug Fixes
+      labels:
+        - "*"

.php_cs renamed to .php-cs-fixer.php

@@ -2,9 +2,9 @@
 
 /** @var PhpCsFixer\Config $config */
 if (isset($_SERVER['argv']) && $_SERVER['argv'][3]) {
-    $config = require dirname($_SERVER['argv'][3], 3) . '/.php_cs.dist';
+    $config = require dirname($_SERVER['argv'][3], 3) . '/.php-cs-fixer.dist.php';
 } else {
-    $config = require __DIR__ . '/../../../.php_cs.dist';
+    $config = require __DIR__ . '/../../../.php-cs-fixer.dist.php';
 }
 
 $originalRules = $config->getRules();
@@ -14,7 +14,7 @@
 // Commented rules are released, but not in the version of PHP CS fixer Magento supports
 $extensionRules = [
     'blank_line_after_opening_tag' => true,
-    'blank_line_before_return' => true,
+    'blank_line_before_statement' => true,
     'cast_spaces' => true,
     'combine_consecutive_unsets' => true,
     'mb_str_functions' => true,
@@ -23,7 +23,7 @@
     'no_empty_statement' => true,
     'no_multiline_whitespace_around_double_arrow' => true,
     'no_short_bool_cast' => true,
-    'no_short_echo_tag' => true,
+    'echo_tag_syntax' => true,
     // 'no_superfluous_phpdoc_tags' => true,
     'no_unneeded_control_parentheses' => true,
     'no_unreachable_default_argument_value' => true,
@@ -37,20 +37,22 @@
     'not_operator_with_space' => false,
     'object_operator_without_whitespace' => true,
     'phpdoc_annotation_without_dot' => true,
-    'phpdoc_inline_tag' => true,
+    'general_phpdoc_tag_rename' => true, 
+    'phpdoc_inline_tag_normalizer' => true,
+    'phpdoc_tag_type' => true,
     'phpdoc_order' => true,
     'phpdoc_scalar' => true,
     'phpdoc_separation' => true,
     'phpdoc_single_line_var_spacing' => true,
     'protected_to_private' => true,
-    'psr4' => true,
+    'psr_autoloading' => true,
     'short_scalar_cast' => true, // ?
     'single_blank_line_before_namespace' => true,
     'single_quote' => true,
     'space_after_semicolon' => true,
     'standardize_not_equals' => true,
     'ternary_operator_spaces' => true,
-    'trailing_comma_in_multiline_array' => true,
+    'trailing_comma_in_multiline' => true,
     'trim_array_spaces' => true,
 ];
 

Api/Data/JobInterface.php

@@ -29,5 +29,52 @@ interface JobInterface
     const FIELD_RETRIES = 'retries';
     const FIELD_ERROR_LOG = 'error_log';
     const FIELD_DATA_SIZE = 'data_size';
-    /**#@-*/
+
+    /**
+     * @return string
+     */
+    public function getClass(): string;
+
+    /**
+     * @param string $class
+     *
+     * @return $this
+     */
+    public function setClass(string $class): self;
+
+    /**
+     * @return string
+     */
+    public function getMethod(): string;
+
+    /**
+     * @param string $method
+     *
+     * @return $this
+     */
+    public function setMethod(string $method): self;
+
+    /**
+     * @return string
+     */
+    public function getBody(): string;
+
+    /**
+     * @param string $data
+     *
+     * @return $this
+     */
+    public function setBody(string $data): self;
+
+    /**
+     * @return int
+     */
+    public function getBodySize(): int;
+
+    /**
+     * @param int $size
+     *
+     * @return $this
+     */
+    public function setBodySize(int $size): self;
 }

Block/Adminhtml/Job/View.php

@@ -27,7 +27,7 @@ public function __construct(
         $this->coreRegistry = $coreRegistry;
     }
 
-    /** {@inheritdoc} */
+    /** @inheritdoc */
     protected function _prepareLayout()
     {
         /** @var Button $button */

Block/Adminhtml/Queue/Status.php

@@ -73,12 +73,15 @@ public function getQueueRunnerStatus()
         switch ($this->queueRunnerIndexer->getStatus()) {
             case \Magento\Framework\Indexer\StateInterface::STATUS_VALID:
                 $status = 'Ready';
+
                 break;
             case \Magento\Framework\Indexer\StateInterface::STATUS_INVALID:
                 $status = 'Reindex required';
+
                 break;
             case \Magento\Framework\Indexer\StateInterface::STATUS_WORKING:
                 $status = 'Processing';
+
                 break;
         }
 

Block/Navigation/Renderer/CategoryRenderer.php

@@ -34,7 +34,7 @@ public function render(FilterInterface $filter)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function canRenderFilter()
     {

Block/Navigation/Renderer/DefaultRenderer.php

@@ -63,7 +63,7 @@ public function getIsSearchable()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function render(FilterInterface $filter)
     {
@@ -80,7 +80,7 @@ public function render(FilterInterface $filter)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getJsLayout()
     {
@@ -109,7 +109,7 @@ public function getJsLayout()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function canRenderFilter()
     {

Block/Navigation/Renderer/PriceRenderer.php

@@ -19,7 +19,7 @@ protected function getFieldFormat()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getConfig()
     {

Block/Navigation/Renderer/SliderRenderer.php

@@ -81,7 +81,7 @@ public function getDataRole()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function canRenderFilter()
     {