Merge branch 'release/2.0.0'

Author: rakibabu

.github/workflows/php.yml

@@ -0,0 +1,9 @@
+name: PHPCS
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: PHPCS
+      run: docker run --rm -v $PWD:/code:ro domw/phpcs phpcs --colors --standard=Magento2 --report=full,summary,gitblame --extensions=php,phtml ./

.gitignore

@@ -0,0 +1 @@
+.DS_Store

Block/Adminhtml/System/Config/Button.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace JustBetter\Sentry\Block\Adminhtml\System\Config;
+
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+class DeploymentConfigInfo extends Field
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'system/config/deployment-config-info.phtml';
+
+    public function render(AbstractElement $element)
+    {
+        return $this->_toHtml();
+    }
+}

Block/Adminhtml/System/Config/DeploymentConfigInfo.php

@@ -1,11 +1,17 @@
 CHANGELOG
 
+2019-11-19 - 2.0.0
+
+    * Merged PR (https://github.com/justbetter/magento2-sentry/pull/29) thanks to https://github.com/michielgerritsen
+    * Merged PR (https://github.com/justbetter/magento2-sentry/pull/26) thanks to https://github.com/JosephMaxwell
+    * Merged PR (https://github.com/justbetter/magento2-sentry/pull/27) thanks to https://github.com/DominicWatts
+
 2019-08-29 - 0.8.0
 
     * Merged PR (https://github.com/justbetter/magento2-sentry/pull/24) thanks to https://github.com/kyriog
     * Merged PR (https://github.com/justbetter/magento2-sentry/pull/22) thanks to https://github.com/fredden
     * Merged PR (https://github.com/justbetter/magento2-sentry/pull/21) thanks to https://github.com/erikhansen
-    
+
 2019-06-19 - 0.7.2
 
     * Reverted async attribute

CHANGELOG.md

@@ -81,7 +81,9 @@ public function execute()
         if ($sentryDomain && is_dir($composerBin)) {
             try {
                 $result['status']  = true;
-                $result['content'] = nl2br(shell_exec($composerBin . 'sentry test ' . escapeshellarg($sentryDomain) . ' -v'));
+                $result['content'] = nl2br(shell_exec(
+                    $composerBin . 'sentry test ' . escapeshellarg($sentryDomain) . ' -v'
+                ));
             } catch (\Exception $e) {
                 $result['content'] = $e->getMessage();
                 $this->logger->critical($e);

Controller/Adminhtml/Test/Sentry.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\App\DeploymentConfig;
 
 class Data extends AbstractHelper
 {
@@ -25,12 +26,9 @@ class Data extends AbstractHelper
      */
     protected $configKeys = [
         'domain',
-        'enabled',
         'log_level',
         'mage_mode_development',
         'environment',
-        'enable_script_tag',
-        'script_tag_placement',
     ];
 
     /**
@@ -50,17 +48,39 @@ class Data extends AbstractHelper
      * @param StoreManagerInterface $storeManager
      * @param State                 $appState
      */
-    public function __construct(Context $context, StoreManagerInterface $storeManager, State $appState, ProductMetadataInterface $productMetadataInterface
+    public function __construct(
+        Context $context,
+        StoreManagerInterface $storeManager,
+        State $appState,
+        ProductMetadataInterface $productMetadataInterface,
+        DeploymentConfig $deploymentConfig
     ) {
         $this->storeManager = $storeManager;
         $this->appState = $appState;
         $this->scopeConfig = $context->getScopeConfig();
         $this->productMetadataInterface = $productMetadataInterface;
+        $this->deploymentConfig = $deploymentConfig;
         $this->collectModuleConfig();
 
         parent::__construct($context);
     }
 
+    /**
+     * @return mixed
+     */
+    public function getDSN()
+    {
+        return $this->config['domain'];
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getEnvironment()
+    {
+        return $this->config['environment'];
+    }
+
     /**
      * @param      $field
      * @param null $storeId
@@ -90,8 +110,10 @@ public function getGeneralConfig($code, $storeId = null)
      */
     public function collectModuleConfig()
     {
-        foreach ($this->configKeys as $key => $value) {
-            $this->config[ $value ] = $this->getGeneralConfig($value);
+        $this->config['enabled'] = $this->deploymentConfig->get('sentry') !== null;
+
+        foreach ($this->configKeys as $value) {
+            $this->config[$value] = $this->deploymentConfig->get('sentry/' . $value);
         }
 
         return $this->config;
@@ -102,7 +124,11 @@ public function collectModuleConfig()
      */
     public function isActive()
     {
-        return (! empty($this->config) && array_key_exists('enabled', $this->config) && $this->config['enabled'] && ($this->isProductionMode() || $this->isOverwriteProductionMode()));
+        return !empty($this->config)
+            && array_key_exists('enabled', $this->config)
+            && $this->config['enabled']
+            && $this->getDSN()
+            && ($this->isProductionMode() || $this->isOverwriteProductionMode());
     }
 
     /**
@@ -152,7 +178,7 @@ public function getStore()
      */
     public function useScriptTag()
     {
-        return isset($this->config['enable_script_tag']) && $this->config['enable_script_tag'];
+        return $this->scopeConfig->isSetFlag(static::XML_PATH_SRS . 'enable_script_tag');
     }
 
     /**
@@ -161,11 +187,12 @@ public function useScriptTag()
      */
     public function showScriptTagInThisBlock($blockName)
     {
-        if (!isset($this->config['script_tag_placement'])) {
+        $config = $this->getGeneralConfig('script_tag_placement');
+        if (!$config) {
             return false;
         }
 
-        $name = 'sentry.' . $this->config['script_tag_placement'];
+        $name = 'sentry.' . $config;
 
         return $name == $blockName;
     }