Merge pull request #3 from mageplaza/develop

Develop

Author: brianmageplaza

Block/Adminhtml/System/Snippet.php

@@ -32,7 +32,7 @@
 class Snippet extends Field
 {
     /**
-     * @param  AbstractElement $element
+     * @param AbstractElement $element
      *
      * @return string
      */
@@ -47,7 +47,7 @@ protected function _getElementHtml(AbstractElement $element)
 
         $html .= __('Template .phtml file');
         $html .= '</strong><br /><pre style="background-color: #f5f5dc;"><code>' . $this->_escaper->escapeHtml(
-                '<?php echo $block->getLayout()->createBlock(\Mageplaza\TwitterWidget\Block\Widget::class)->setData([
+            '<?php echo $block->getLayout()->createBlock(\Mageplaza\TwitterWidget\Block\Widget::class)->setData([
         "title" => "Twitter timeline",
         "description" => "",
         "design" => "0",
@@ -56,11 +56,11 @@ protected function _getElementHtml(AbstractElement $element)
         "limit" => "10"
         ])
     ->toHtml();?>'
-            ) . '</code></pre><strong>';
+        ) . '</code></pre><strong>';
 
         $html .= __('Layout file');
         $html .= '</strong><br /><pre style="background-color: #f5f5dc;"><code>' . $this->_escaper->escapeHtml(
-                '<block class="Mageplaza\TwitterWidget\Block\Widget" name="mp_twitter_widget" >
+            '<block class="Mageplaza\TwitterWidget\Block\Widget" name="mp_twitter_widget" >
 <arguments>
     <argument name="title" xsi:type="string">Twitter timeline</argument>
     <argument name="description" xsi:type="string"></argument>
@@ -70,7 +70,7 @@ protected function _getElementHtml(AbstractElement $element)
     <argument name="limit" xsi:type="string">10</argument>
 </arguments>
 </block>'
-            ) . '</code></pre>';
+        ) . '</code></pre>';
 
         $html .= '</div>';
 

Block/Widget.php

@@ -89,4 +89,12 @@ public function getAllOptions()
 
         return Data::jsonEncode($this->getData());
     }
+
+    /**
+     * @return string
+     */
+    public function getRequestUrl()
+    {
+        return $this->_urlBuilder->getUrl('mptwitterwidget/twitter/');
+    }
 }

CHANGELOG

@@ -1 +1 @@
-CHANGELOG: https://www.mageplaza.com/releases/twitter-widget/
+CHANGELOG: https://www.mageplaza.com/releases/twitter-widget/

Controller/Twitter/Index.php

@@ -21,11 +21,18 @@
 
 namespace Mageplaza\TwitterWidget\Controller\Twitter;
 
+use Exception;
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\HTTP\Adapter\Curl;
 use Magento\Framework\HTTP\Adapter\CurlFactory;
 use Mageplaza\TwitterWidget\Helper\Data;
 use Psr\Log\LoggerInterface;
+use Zend_Http_Client;
 
 /**
  * Class Twitter
@@ -49,35 +56,43 @@ class Index extends Action
      */
     protected $_helperData;
 
+    /**
+     * @var JsonFactory
+     */
+    protected $resultJsonFactory;
+
     /**
      * Index constructor.
      *
      * @param Context $context
      * @param CurlFactory $curlFactory
      * @param Data $helperData
+     * @param JsonFactory $jsonFactory
      * @param LoggerInterface $logger
      */
     public function __construct(
         Context $context,
         CurlFactory $curlFactory,
         Data $helperData,
+        JsonFactory $jsonFactory,
         LoggerInterface $logger
     ) {
-        $this->curlFactory = $curlFactory;
-        $this->_helperData = $helperData;
-        $this->logger = $logger;
+        $this->curlFactory       = $curlFactory;
+        $this->_helperData       = $helperData;
+        $this->resultJsonFactory = $jsonFactory;
+        $this->logger            = $logger;
 
         parent::__construct($context);
     }
 
     /**
-     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
+     * @return ResponseInterface|ResultInterface
      */
     public function execute()
     {
         $result = ['status' => false];
         try {
-            $params = $this->getRequest()->getParams();
+            $params   = $this->getRequest()->getParams();
             $response = $this->getEmbedResponse($params);
             if (array_key_exists('html', $response)) {
                 $result = [
@@ -90,12 +105,15 @@ public function execute()
                     'content' => $response['message']
                 ];
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $result['content'] = $e->getMessage();
             $this->logger->critical($e);
         }
 
-        return $this->getResponse()->representJson($this->_helperData->getJsonEncode($result));
+        /** @var Json $resultJson */
+        $resultJson = $this->resultJsonFactory->create();
+
+        return $resultJson->setData($result);
     }
 
     /**
@@ -105,24 +123,24 @@ public function execute()
      */
     public function getEmbedResponse($params)
     {
-        $result = [];
+        $result                = [];
         $params['omit_script'] = '1';
-        $url = 'https://publish.twitter.com/oembed?' . http_build_query($params, null, '&');
+        $url                   = 'https://publish.twitter.com/oembed?' . http_build_query($params, null, '&');
 
-        /** @var \Magento\Framework\HTTP\Adapter\Curl $curl */
+        /** @var Curl $curl */
         $curl = $this->curlFactory->create();
-        $curl->write(\Zend_Http_Client::GET, $url, '1.1', [], '');
+        $curl->write(Zend_Http_Client::GET, $url, '1.1', [], '');
 
         try {
             $resultCurl = $curl->read();
             if (!empty($resultCurl)) {
                 $responseBody = $this->_helperData->getHttpResponse($resultCurl);
-                $result += $this->_helperData->getJsonDecode($responseBody);
+                $result       += $this->_helperData->getJsonDecode($responseBody);
                 if (!count($result)) {
                     $result['message'] = __('Sorry, that twitter page doesn\'t exist!');
                 }
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $result['message'] = $e->getMessage();
         }
 

Helper/Data.php

@@ -22,6 +22,7 @@
 namespace Mageplaza\TwitterWidget\Helper;
 
 use Mageplaza\Core\Helper\AbstractData;
+use Zend_Http_Response;
 
 /**
  * Class Data
@@ -115,16 +116,6 @@ public function getUsername($store = null)
         return $this->getConfigGeneral('username', $store);
     }
 
-    /**
-     * @param $data
-     *
-     * @return string
-     */
-    public function getJsonEncode($data)
-    {
-        return Data::jsonEncode($data);
-    }
-
     /**
      * @param $data
      *
@@ -142,6 +133,6 @@ public function getJsonDecode($data)
      */
     public function getHttpResponse($data)
     {
-        return \Zend_Http_Response::extractBody($data);
+        return Zend_Http_Response::extractBody($data);
     }
 }

LICENSE

@@ -1,33 +1,33 @@
-Copyright © 2016-present Mageplaza Co. Ltd.
-
-This License is entered by Mageplaza to govern the usage or redistribution of Mageplaza software. This is a legal agreement between you (either an individual or a single entity) and Mageplaza for Mageplaza software product(s) which may include extensions, templates and services.
-
-By purchasing, installing, or otherwise using Mageplaza products, you acknowledge that you have read this License and agree to be bound by the terms of this Agreement. If you do not agree to the terms of this License, do not install or use Mageplaza products.
-
-The Agreement becomes effective at the moment when you acquire software from our site or receive it through email or on data medium or by any other means. Mageplaza reserves the right to make reasonable changes to the terms of this license agreement and impose its clauses at any given time.
-
-    1. GRANT OF LICENSE: By purchasing a product of Mageplaza:
-
-        1. Customer will receive source code open 100%.
-
-        2. Customer will obtain a License Certificate which will remain valid until the Customer stops using the Product or until Mageplaza terminates this License because of Customer’s failure to comply with any of its Terms and Conditions. Each License Certificate includes a license serial which is valid for one live Magento installation only and unlimited test Magento installations.
-
-        3. You are allowed to customize our products to fit with your using purpose.
-
-        4. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS
-
-        5. Installation and Use
-
-        6. For each new Software installation, you are obliged to purchase a separate License. You are not permitted to use any part of the code in whole or part in any other software or product or website. You are legally bound to preserve the copyright information intact including the text/link at bottom.
-
-    2. Distribution: You are not allowed to distribute Mageplaza software to third parties. Any distribution without our permission, including non commercial distribution is considered as violation of this Agreement and entails liability, according to the current law. You may not place the Software onto a server that allows access to the Software via a public network or the Internet for distribution purposes.
-
-    3. Rental: You may not give, sell, sub-license, rent, lease or lend any portion of the Software to anyone.
-
-    4. Compliance with Applicable Laws: You must comply with all applicable laws regarding use of software products. Mageplaza software and a portion of it are protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. Accordingly, customer is required to treat the software like any other copyrighted material. Any activity violating copyright law will be prosecuted according to the current law. We retain the right to revoke the license of any user holding an invalid license.
-
-    5. TERMINATION: Without prejudice to any other rights, Mageplaza may terminate this License at any time if you fail to comply with the terms and conditions of this License. In such event, it constitutes a breach of the agreement, and your license to use the program is revoked and you must destroy all copies of Mageplaza products in your possession. After being notified of termination of your license, if you continue to use Mageplaza software, you hereby agree to accept an injunction to prevent you from its further use and to pay all costs (including but not limited to reasonable attorney fees) to enforce our revocation of your license and any damages suffered by us because of your misuse of the Software. We are not bound to return you the amount spent for purchase of the Software for the termination of this License.
-
-    6. LIMITATION OF LIABILITY: In no event shall Mageplaza be liable for any damages (including, without limitation, lost profits, business interruption, or lost information) rising out of ‘Authorized Users’ use of or inability to use the Mageplaza products, even if Mageplaza has been advised of the possibility of such damages. In no event will Mageplaza be liable for prosecution arising from use of the Software against law or for any illegal use.
-
+Copyright © 2016-present Mageplaza Co. Ltd.
+
+This License is entered by Mageplaza to govern the usage or redistribution of Mageplaza software. This is a legal agreement between you (either an individual or a single entity) and Mageplaza for Mageplaza software product(s) which may include extensions, templates and services.
+
+By purchasing, installing, or otherwise using Mageplaza products, you acknowledge that you have read this License and agree to be bound by the terms of this Agreement. If you do not agree to the terms of this License, do not install or use Mageplaza products.
+
+The Agreement becomes effective at the moment when you acquire software from our site or receive it through email or on data medium or by any other means. Mageplaza reserves the right to make reasonable changes to the terms of this license agreement and impose its clauses at any given time.
+
+    1. GRANT OF LICENSE: By purchasing a product of Mageplaza:
+
+        1. Customer will receive source code open 100%.
+
+        2. Customer will obtain a License Certificate which will remain valid until the Customer stops using the Product or until Mageplaza terminates this License because of Customer’s failure to comply with any of its Terms and Conditions. Each License Certificate includes a license serial which is valid for one live Magento installation only and unlimited test Magento installations.
+
+        3. You are allowed to customize our products to fit with your using purpose.
+
+        4. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS
+
+        5. Installation and Use
+
+        6. For each new Software installation, you are obliged to purchase a separate License. You are not permitted to use any part of the code in whole or part in any other software or product or website. You are legally bound to preserve the copyright information intact including the text/link at bottom.
+
+    2. Distribution: You are not allowed to distribute Mageplaza software to third parties. Any distribution without our permission, including non commercial distribution is considered as violation of this Agreement and entails liability, according to the current law. You may not place the Software onto a server that allows access to the Software via a public network or the Internet for distribution purposes.
+
+    3. Rental: You may not give, sell, sub-license, rent, lease or lend any portion of the Software to anyone.
+
+    4. Compliance with Applicable Laws: You must comply with all applicable laws regarding use of software products. Mageplaza software and a portion of it are protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. Accordingly, customer is required to treat the software like any other copyrighted material. Any activity violating copyright law will be prosecuted according to the current law. We retain the right to revoke the license of any user holding an invalid license.
+
+    5. TERMINATION: Without prejudice to any other rights, Mageplaza may terminate this License at any time if you fail to comply with the terms and conditions of this License. In such event, it constitutes a breach of the agreement, and your license to use the program is revoked and you must destroy all copies of Mageplaza products in your possession. After being notified of termination of your license, if you continue to use Mageplaza software, you hereby agree to accept an injunction to prevent you from its further use and to pay all costs (including but not limited to reasonable attorney fees) to enforce our revocation of your license and any damages suffered by us because of your misuse of the Software. We are not bound to return you the amount spent for purchase of the Software for the termination of this License.
+
+    6. LIMITATION OF LIABILITY: In no event shall Mageplaza be liable for any damages (including, without limitation, lost profits, business interruption, or lost information) rising out of ‘Authorized Users’ use of or inability to use the Mageplaza products, even if Mageplaza has been advised of the possibility of such damages. In no event will Mageplaza be liable for prosecution arising from use of the Software against law or for any illegal use.
+
 The latest License: https://www.mageplaza.com/LICENSE.txt