Fixed GH-7

Author: Rafael Grigorian

src/app/code/JetRails/Varnish/Console/Command/AbstractCommand.php

@@ -2,9 +2,11 @@
 
 	namespace JetRails\Varnish\Console\Command;
 
+
 	use JetRails\Varnish\Helper\Data;
 	use JetRails\Varnish\Helper\Purger;
 	use JetRails\Varnish\Logger\Logger;
+	use Magento\Framework\App\Cache\TypeListInterface;
 	use Symfony\Component\Console\Command\Command;
 	use Symfony\Component\Console\Input\InputInterface;
 	use Symfony\Component\Console\Output\OutputInterface;
@@ -27,27 +29,37 @@ abstract class AbstractCommand extends Command {
 		 * These internal data members include instances of helper classes that are injected into
 		 * the class using dependency injection on runtime.  Also a boolean variable is included
 		 * that defines if the action should be run if the feature is disabled in the store config.
+		 * @var         TypeListInterface   _cacheTypeList      Instance of the TypeListInterface class
 		 * @var         Data                _data               Instance of the Data class
 		 * @var         Logger              _logger             Instance of the Logger class
 		 * @var         Purger              _purger             Instance of the Purger class
 		 * @var         Boolean             _runIfDisabled      Execute method if feature isn't on?
 		 */
+		protected $_cacheTypeList;
 		protected $_data;
 		protected $_logger;
 		protected $_purger;
 		protected $_runIfDisabled = true;
 
+
 		/**
 		 * This constructor is overloaded from the parent class in order to use dependency injection
 		 * to get the dependency classes that we need for this module's command actions to execute.
 		 * @param       Data                data                Instance of the Data class
 		 * @param       Logger              logger              Instance of the Logger class
 		 * @param       Purger              purger              Instance of the Purger class
+		 * @param       TypeListInterface   cacheTypeList       Instance of the TypeListInterface class
 		 */
-		public function __construct ( Data $data, Logger $logger, Purger $purger ) {
+		public function __construct (
+			Data $data,
+			Logger $logger,
+			Purger $purger,
+			TypeListInterface $cacheTypeList
+		) {
 			// Call the parent constructor
 			parent::__construct ();
 			// Save injected classes internally
+			$this->_cacheTypeList = $cacheTypeList;
 			$this->_data = $data;
 			$this->_logger = $logger;
 			$this->_purger = $purger;
@@ -154,4 +166,4 @@ protected function execute ( InputInterface $input, OutputInterface $output ) {
 		 */
 		protected abstract function runCommand ( InputInterface $input );
 
-	}
+	}

src/app/code/JetRails/Varnish/Console/Command/Status/Set.php

@@ -2,7 +2,9 @@
 
 	namespace JetRails\Varnish\Console\Command\Status;
 
+
 	use JetRails\Varnish\Console\Command\AbstractCommand;
+	use Magento\Framework\App\Cache\Type\Config as ConfigType;
 	use Magento\PageCache\Model\Config;
 	use Symfony\Component\Console\Input\InputArgument;
 	use Symfony\Component\Console\Input\InputInterface;
@@ -53,6 +55,9 @@ protected function runCommand ( InputInterface $input ) {
 					// Set the state value in the store config
 					$stateValue = $state ? Config::VARNISH : Config::BUILT_IN;
 					$this->_data->setCachingApplication ( $stateValue );
+					$this->_data->setEnable ( $stateValue === Config::VARNISH );
+					// Clean the config cache so we get the right values when querying for them
+					$this->_cacheTypeList->cleanType ( ConfigType::TYPE_IDENTIFIER );
 					// Construct the message and respond to caller
 					$message = $state ? "Varnish" : "Built-in";
 					$message = "<options=underscore>" . $message . " Cache</>";
@@ -68,4 +73,4 @@ protected function runCommand ( InputInterface $input ) {
 			return [ "status" => false, "message" => $message ];
 		}
 
-	}
+	}

src/app/code/JetRails/Varnish/Helper/Data.php

@@ -4,8 +4,6 @@
 
 	use JetRails\Varnish\Model\Adminhtml\Config\Options\EnableDisable;
 	use JetRails\Varnish\Model\Adminhtml\Config\Options\YesNo;
-	use Magento\Framework\App\Cache\TypeListInterface;
-	use Magento\Framework\App\Cache\Type\Config;
 	use Magento\Framework\App\Config\ScopeConfigInterface;
 	use Magento\Framework\App\Config\Storage\WriterInterface;
 	use Magento\Framework\App\Helper\AbstractHelper;
@@ -31,32 +29,27 @@ class Data extends AbstractHelper {
 		/**
 		 * These internal data members include instances of helper classes that are injected into
 		 * the class using dependency injection on runtime.
-		 * @var         TypeListInterface      _cacheTypeList  Instance of the TypeListInterface
 		 * @var         ScopeConfigInterface   _configReader   Instance of the ScopeConfigInterface
 		 * @var         StoreManagerInterface  _configWriter   Instance of the StoreManagerInterface
 		 * @var         WriterInterface        _storeManager   Instance of the WriterInterface
 		 */
-		protected $_cacheTypeList;
 		protected $_configReader;
 		protected $_configWriter;
 		protected $_storeManager;
 
 		/**
 		 * This constructor is overloaded from the parent class in order to use dependency injection
 		 * to get the dependency classes that we need for this module's command actions to execute.
-		 * @param       TypeListInterface      cacheTypeList   Instance of the TypeListInterface
 		 * @param       ScopeConfigInterface   configReader    Instance of the ScopeConfigInterface
 		 * @param       StoreManagerInterface  configWriter    Instance of the StoreManagerInterface
 		 * @param       WriterInterface        storeManager    Instance of the WriterInterface
 		 */
 		public function __construct (
-			TypeListInterface $cacheTypeList,
 			ScopeConfigInterface $configReader,
 			StoreManagerInterface $storeManager,
 			WriterInterface $configWriter
 		) {
 			// Save the injected class instances
-			$this->_cacheTypeList = $cacheTypeList;
 			$this->_configReader = $configReader;
 			$this->_storeManager = $storeManager;
 			$this->_configWriter = $configWriter;
@@ -71,8 +64,6 @@ public function __construct (
 		 * @return      String                                  The value of the variable
 		 */
 		private function _getStoreValue ( $path, $scope = ScopeInterface::SCOPE_STORE ) {
-			// Clean the config cache so we go the right values
-			$this->_cacheTypeList->cleanType ( Config::TYPE_IDENTIFIER );
 			// Ask the config reader to get the value in the store scope
 			return $this->_configReader->getValue ( $path, $scope );
 		}
@@ -155,6 +146,20 @@ public function isEnabled () {
 			return $enabled == CacheConfig::VARNISH;
 		}
 
+		/**
+		 * This method simply takes in a boolean value that represents the enable/disable state of this
+		 * module. It then saves it into the configuration. Note that config cache is not invalidated in
+		 * this method.
+		 * @param       boolean             status              What to set the enable setting to
+		 * @return      void
+		 */
+		public function setEnable ( $status ) {
+			// Translate the status into a status state
+			$value = $status ? EnableDisable::ENABLED : EnableDisable::DISABLED;
+			// Simply save it into the store config
+			$this->_configWriter->save ( "jetrails_varnish/general_configuration/status", $value );
+		}
+
 		/**
 		 * This method takes in a class constant from CacheConfig and sets it in the store config.
 		 * @param       CacheConfig         value               Class constant for caching app state
@@ -267,4 +272,4 @@ public function getExcludedRoutes () {
 			return array_filter ( $routes, function ( $i ) { return $i != ""; });
 		}
 
-	}
+	}

src/app/code/JetRails/Varnish/Observer/Save/Cache.php

@@ -3,6 +3,8 @@
 	namespace JetRails\Varnish\Observer\Save;
 
 	use JetRails\Varnish\Model\Adminhtml\Config\Options\EnableDisable;
+	use Magento\Framework\App\Cache\Type\Config;
+	use Magento\Framework\App\Cache\TypeListInterface;
 	use Magento\Framework\App\Config\ScopeConfigInterface;
 	use Magento\Framework\App\Config\Storage\WriterInterface;
 	use Magento\Framework\Event\Observer;
@@ -26,23 +28,28 @@ class Cache implements ObserverInterface {
 		/**
 		 * These internal data members include instances of helper classes that are injected into
 		 * the class using dependency injection on runtime.
+		 * @var         TypeListInterface       _cacheTypeList  Instance of the TypeListInterface
 		 * @var         ScopeConfigInterface    _configReader   Instance of ScopeConfigInterface
 		 * @var         WriterInterface         _configWriter   Instance of WriterInterface
 		 */
+		protected $_cacheTypeList;
 		protected $_configReader;
 		protected $_configWriter;
 
 		/**
 		 * This constructor is overloaded from the parent class in order to use dependency injection
 		 * to get the dependency classes that we need for this module's command actions to execute.
+		 * @param       TypeListInterface       cacheTypeList   Instance of the TypeListInterface
 		 * @param       ScopeConfigInterface    configReader    Instance of ScopeConfigInterface
 		 * @param       WriterInterface         configWriter    Instance of WriterInterface
 		 */
 		public function __construct (
+			TypeListInterface $cacheTypeList,
 			ScopeConfigInterface $configReader,
 			WriterInterface $configWriter
 		) {
 			// Save the injected class instances
+			$this->_cacheTypeList = $cacheTypeList;
 			$this->_configReader = $configReader;
 			$this->_configWriter = $configWriter;
 		}
@@ -67,6 +74,8 @@ public function execute ( Observer $observer ) {
 				"jetrails_varnish/general_configuration/status",
 				$cacheApp == CacheConfig::VARNISH ? EnableDisable::ENABLED : EnableDisable::DISABLED
 			);
+			// Clean the config cache so we get the right values when querying for them
+			$this->_cacheTypeList->cleanType ( Config::TYPE_IDENTIFIER );
 		}
 
-	}
+	}

src/app/code/JetRails/Varnish/Observer/Save/Config.php

@@ -3,6 +3,8 @@
 	namespace JetRails\Varnish\Observer\Save;
 
 	use JetRails\Varnish\Model\Adminhtml\Config\Options\EnableDisable;
+	use Magento\Framework\App\Cache\Type\Config as ConfigType;
+	use Magento\Framework\App\Cache\TypeListInterface;
 	use Magento\Framework\App\Config\ScopeConfigInterface;
 	use Magento\Framework\App\Config\Storage\WriterInterface;
 	use Magento\Framework\Event\Observer;
@@ -29,27 +31,32 @@ class Config implements ObserverInterface {
 		 * These internal data members include instances of helper classes that are injected into
 		 * the class using dependency injection on runtime.
 		 * @var         ManagerInterface        _message        Instance of ManagerInterface
+		 * @var         TypeListInterface       _cacheTypeList  Instance of the TypeListInterface
 		 * @var         ScopeConfigInterface    _configReader   Instance of ScopeConfigInterface
 		 * @var         WriterInterface         _configWriter   Instance of WriterInterface
 		 */
 		protected $_message;
+		protected $_cacheTypeList;
 		protected $_configReader;
 		protected $_configWriter;
 
 		/**
 		 * This constructor is overloaded from the parent class in order to use dependency injection
 		 * to get the dependency classes that we need for this module's command actions to execute.
 		 * @param       ManagerInterface        message         Instance of ManagerInterface
+		 * @param       TypeListInterface       cacheTypeList   Instance of the TypeListInterface
 		 * @param       ScopeConfigInterface    configReader    Instance of ScopeConfigInterface
 		 * @param       WriterInterface         configWriter    Instance of WriterInterface
 		 */
 		public function __construct (
 			ManagerInterface $message,
+			TypeListInterface $cacheTypeList,
 			ScopeConfigInterface $configReader,
 			WriterInterface $configWriter
 		) {
 			// Save the injected class instances
 			$this->_message = $message;
+			$this->_cacheTypeList = $cacheTypeList;
 			$this->_configReader = $configReader;
 			$this->_configWriter = $configWriter;
 		}
@@ -181,6 +188,8 @@ public function execute ( Observer $observer ) {
 				"system/full_page_cache/caching_application",
 				$status == EnableDisable::ENABLED ? CacheConfig::VARNISH : CacheConfig::BUILT_IN
 			);
+			// Clean the config cache so we get the right values when querying for them
+			$this->_cacheTypeList->cleanType ( ConfigType::TYPE_IDENTIFIER );
 		}
 
-	}
+	}