Merge pull request #37 from tuyennn/develop

Bump to v1.1.9
tuyennn · Jun 22, 2020 · ad8c0c3 · ad8c0c3
2 parents b8efe0c + 42ab99a
commit ad8c0c3
Show file tree

Hide file tree

Showing 37 changed files with 307 additions and 1,502 deletions.
diff --git a/Api/Data/ItemInterface.php b/Api/Data/ItemInterface.php
@@ -2,6 +2,9 @@
 
 namespace GhoSter\AutoInstagramPost\Api\Data;
 
+/**
+ * Interface ItemInterface
+ */
 interface ItemInterface
 {
 

diff --git a/Api/Data/ItemSearchResultInterface.php b/Api/Data/ItemSearchResultInterface.php
@@ -4,6 +4,9 @@
 
 use Magento\Framework\Api\SearchResultsInterface;
 
+/**
+ * Interface ItemSearchResultInterface
+ */
 interface ItemSearchResultInterface extends SearchResultsInterface
 {
 

diff --git a/Api/ItemRepositoryInterface.php b/Api/ItemRepositoryInterface.php
@@ -5,6 +5,9 @@
 use Magento\Framework\Api\SearchCriteriaInterface;
 use GhoSter\AutoInstagramPost\Api\Data\ItemInterface;
 
+/**
+ * Interface ItemRepositoryInterface
+ */
 interface ItemRepositoryInterface
 {
 

diff --git a/Api/WorkerInterface.php b/Api/WorkerInterface.php
@@ -5,6 +5,9 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 
+/**
+ * Interface WorkerInterface
+ */
 interface WorkerInterface
 {
 

diff --git a/Block/Adminhtml/Product.php b/Block/Adminhtml/Product.php
@@ -5,8 +5,9 @@
 use Magento\Eav\Setup\EavSetup;
 
 /**
+ * Product Widget Container
+ *
  * Class Product
- * @package GhoSter\AutoInstagramPost\Block\Adminhtml
  */
 class Product extends \Magento\Backend\Block\Widget\Container
 {

diff --git a/Block/Adminhtml/System/Config/Hashtag.php b/Block/Adminhtml/System/Config/Hashtag.php
@@ -6,8 +6,9 @@
 use GhoSter\AutoInstagramPost\Block\Adminhtml\System\Config\Hashtag\Activation;
 
 /**
+ * Hashtag Field
+ *
  * Class Hashtag
- * @package GhoSter\AutoInstagramPost\Block\Adminhtml\System\Config
  */
 class Hashtag extends AbstractFieldArray
 {

diff --git a/Block/Adminhtml/System/Config/Hashtag/Activation.php b/Block/Adminhtml/System/Config/Hashtag/Activation.php
@@ -7,8 +7,9 @@
 use Magento\Config\Model\Config\Source\Enabledisable;
 
 /**
+ * Activation Select Element
+ *
  * Class Activation
- * @package GhoSter\AutoInstagramPost\Block\Adminhtml\System\Config\Hashtag
  */
 class Activation extends Select
 {

diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php
@@ -7,8 +7,9 @@
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
 /**
+ * TestConnection Field
+ *
  * Class TestConnection
- * @package GhoSter\AutoInstagramPost\Block\Adminhtml\System\Config
  */
 class TestConnection extends Field
 {

diff --git a/Controller/Adminhtml/Manage/Index.php b/Controller/Adminhtml/Manage/Index.php
@@ -9,8 +9,9 @@
 use Magento\Backend\Model\View\Result\Page;
 
 /**
+ * Manager Index Controller
+ *
  * Class Index
- * @package GhoSter\AutoInstagramPost\Controller\Adminhtml\Manage
  */
 class Index extends ProductController
 {

diff --git a/Controller/Adminhtml/Manage/MassPost.php b/Controller/Adminhtml/Manage/MassPost.php
@@ -12,8 +12,9 @@
 use GhoSter\AutoInstagramPost\Model\Config as InstagramConfig;
 
 /**
+ * Manager MassPost Controller
+ *
  * Class MassPost
- * @package GhoSter\AutoInstagramPost\Controller\Adminhtml\Manage
  */
 class MassPost extends Action
 {

diff --git a/Controller/Adminhtml/Manage/Post.php b/Controller/Adminhtml/Manage/Post.php
@@ -11,8 +11,9 @@
 use GhoSter\AutoInstagramPost\Model\Instagram\Worker as InstagramWorker;
 
 /**
+ * Manager Post Controller
+ *
  * Class Post
- * @package GhoSter\AutoInstagramPost\Controller\Adminhtml\Manage
  */
 class Post extends Action
 {

diff --git a/Controller/Adminhtml/System/Config/TestConnection.php b/Controller/Adminhtml/System/Config/TestConnection.php
@@ -11,8 +11,9 @@
 use Psr\Log\LoggerInterface;
 
 /**
+ * Test Connection Controller
+ *
  * Class TestConnection
- * @package GhoSter\AutoInstagramPost\Controller\Adminhtml\System\Config
  */
 class TestConnection extends Action
 {
@@ -93,7 +94,9 @@ public function execute()
 
                 $responseData = [
                     'success' => $status,
-                    'message' => $status ? __('Connection Success') : __('Unauthorized Instagram Account, check your user/password settings')
+                    'message' => $status
+                        ? __('Connection Success')
+                        : __('Unauthorized Instagram Account, check your user/password settings')
                 ];
 
             } else {

diff --git a/Cron/SchedulePost.php b/Cron/SchedulePost.php
@@ -9,8 +9,9 @@
 use Psr\Log\LoggerInterface;
 
 /**
+ * Cron for SchedulePost
+ *
  * Class SchedulePost
- * @package GhoSter\AutoInstagramPost\Cron
  */
 class SchedulePost
 {

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -17,8 +17,9 @@
 use GhoSter\AutoInstagramPost\Model\Config as InstagramConfig;
 
 /**
+ * AutoInstagramPost Data Helper
+ *
  * Class Data
- * @package GhoSter\AutoInstagramPost\Helper
  */
 class Data extends AbstractHelper
 {
@@ -265,7 +266,7 @@ public function getInstagramPostDescription($product)
         $html = '';
         $stringTemplate = $this->config->getInstagramPostTemplate();
 
-        if (preg_match_all("~\{\{\s*(.*?)\s*\}\}~", $stringTemplate, $matches)) {
+        if (preg_match_all("~{{\s*(.*?)\s*}}~", $stringTemplate, $matches)) {
             if (isset($matches[1]) && is_array($matches[1])) {
                 foreach ($matches[1] as $key => $match) {
                     $addOnSpace = $key !== 0 ? self::SPACE_STRING : '';

diff --git a/Model/Config.php b/Model/Config.php
@@ -14,8 +14,9 @@
 use GhoSter\AutoInstagramPost\Model\Serialize\Serializer;
 
 /**
+ * AutoInstagramPost Config
+ *
  * Class Config
- * @package GhoSter\AutoInstagramPost\Model
  */
 class Config
 {
@@ -24,6 +25,7 @@ class Config
     const XML_PATH_INSTAGRAM_PASSWORD = 'auto_instagram_post/general/password';
     const XML_PATH_DEFAULT_IMAGE = 'auto_instagram_post/general/upload_image_id';
     const XML_PATH_ENABLE_OBSERVER = 'auto_instagram_post/general/enabled_observer';
+    const XML_PATH_ENABLE_DEBUG = 'auto_instagram_post/general/enable_debug';
 
     const XML_PATH_COMMENT_ENABLED = 'auto_instagram_post/comment_hashtag/enabled';
     const XML_PATH_COMMENT_PRODUCT_DESCRIPTION = 'auto_instagram_post/comment_hashtag/product_description';
@@ -184,11 +186,9 @@ public function getDefaultImage($store = null)
             return '';
         }
 
-        $imagePath = $this->directoryList->getPath('media')
+        return $this->directoryList->getPath('media')
             . DIRECTORY_SEPARATOR . $uploadDir
             . DIRECTORY_SEPARATOR . $image;
-
-        return $imagePath;
     }
 
     /**
@@ -199,13 +199,26 @@ public function getDefaultImage($store = null)
      */
     public function isObserverEnabled($store = null)
     {
-        return (bool)$this->scopeConfig->getValue(
+        return $this->scopeConfig->isSetFlag(
             self::XML_PATH_ENABLE_OBSERVER,
             ScopeInterface::SCOPE_STORE,
             $store
         );
     }
 
+    /**
+     * @param null $store
+     * @return bool
+     */
+    public function isDebugEnabled($store = null)
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::XML_PATH_ENABLE_DEBUG,
+            ScopeInterface::SCOPE_STORE,
+            $store
+        );
+    }
+
     /**
      * Check if Hashtag was enabled
      *

diff --git a/Model/Config/Backend/Cron.php b/Model/Config/Backend/Cron.php
@@ -9,8 +9,9 @@
 use GhoSter\AutoInstagramPost\Model\Config as InstagramConfig;
 
 /**
+ * Config Value for Cron
+ *
  * Class Cron
- * @package GhoSter\AutoInstagramPost\Model\Config\Backend
  */
 class Cron extends ConfigValue
 {

diff --git a/Model/Config/Backend/Hashtag.php b/Model/Config/Backend/Hashtag.php
@@ -5,8 +5,9 @@
 use Magento\Config\Model\Config\Backend\Serialized\ArraySerialized;
 
 /**
+ * Config Value for Hashtag
+ *
  * Class Hashtag
- * @package GhoSter\AutoInstagramPost\Model\Config\Backend
  */
 class Hashtag extends ArraySerialized
 {

diff --git a/Model/Config/Backend/Image.php b/Model/Config/Backend/Image.php
@@ -3,8 +3,9 @@
 namespace GhoSter\AutoInstagramPost\Model\Config\Backend;
 
 /**
+ * Config Value for Image
+ *
  * Class Image
- * @package GhoSter\AutoInstagramPost\Model\Config\Backend
  */
 class Image extends \Magento\Config\Model\Config\Backend\Image
 {

diff --git a/Model/ImageProcessor.php b/Model/ImageProcessor.php
@@ -10,8 +10,9 @@
 use GhoSter\AutoInstagramPost\Model\Config as InstagramConfig;
 
 /**
+ * AutoInstagramPost ImageProcessor
+ *
  * Class ImageProcessor
- * @package GhoSter\AutoInstagramPost\Model
  */
 class ImageProcessor
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,9 @@ @@
     namespace GhoSter\AutoInstagramPost\Api\Data;
+    /**
+     * Interface ItemInterface
+     */
     interface ItemInterface
     {
@@ Expand Down @@