Add Nooku::isCache() and Nooku::isDebug() methods

timble · Apr 27, 2015 · 08708bb · 08708bb
1 parent 57394a6
commit 08708bb
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 11 deletions.
diff --git a/config/bootstrapper.php-empty b/config/bootstrapper.php-empty
@@ -46,7 +46,6 @@ return array(
  'translator' => [
 
  //Cache Settings
- 'cache' => false,
  'cache_namespace' => APPLICATION_NAME,
 
  ],
@@ -84,8 +83,6 @@ return array(
  'template.engine.factory' => [
 
  //Cache Settings
- 'debug' => false,
- 'cache' => false,
  'cache_path' => APPLICATION_BASE.'/cache',
  'cache_reload' => false,
  'engines' => [

diff --git a/library/nooku.php b/library/nooku.php
@@ -24,6 +24,20 @@ class Nooku
  */
  const VERSION = '1.0-alpha';
 
+ /**
+ * Debug state
+ *
+ * @var boolean
+ */
+ protected $_debug;
+
+ /**
+ * Cache state
+ *
+ * @var boolean
+ */
+ protected $_cache;
+
  /**
  * The root path
  *
@@ -54,6 +68,20 @@ class Nooku
  */
  final private function __construct($config = array())
  {
+ //Initialize the debug state
+ if(isset($config['debug'])) {
+ $this->_debug = $config['debug'];
+ } else {
+ $this->_debug = false;
+ }
+
+ //Initialize the debug state
+ if(isset($config['cache'])) {
+ $this->_cache = $config['cache'];
+ } else {
+ $this->_cache = false;
+ }
+
  //Initialize the root path
  if(isset($config['root_path'])) {
  $this->_root_path = $config['root_path'];
@@ -175,4 +203,46 @@ public function getBasePath()
  {
  return $this->_base_path;
  }
+
+ /**
+ * Enable or disable debug
+ *
+ * @param bool $debug True or false.
+ * @return Nooku
+ */
+ public function setDebug($debug)
+ {
+ return $this->_debug = (bool) $debug;
+ }
+
+ /**
+ * Check if debug is enabled
+ *
+ * @return bool
+ */
+ public function isDebug()
+ {
+ return $this->_debug;
+ }
+
+ /**
+ * Enable or disable the cache
+ *
+ * @param bool $cache True or false.
+ * @return Nooku
+ */
+ public function setCache($cache)
+ {
+ return $this->_cache = (bool) $cache;
+ }
+
+ /**
+ * Check if caching is enabled
+ *
+ * @return bool
+ */
+ public function isCache()
+ {
+ return $this->_cache;
+ }
 }
diff --git a/library/template/engine/abstract.php b/library/template/engine/abstract.php
@@ -87,8 +87,8 @@ public function __construct(ObjectConfig $config)
  protected function _initialize(ObjectConfig $config)
  {
  $config->append(array(
- 'debug' => false,
- 'cache' => false,
+ 'debug' => \Nooku::getInstance()->isDebug(),
+ 'cache' => \Nooku::getInstance()->isCache(),
  'cache_path' => '',
  'cache_reload' => true,
  'template' => 'default',

diff --git a/library/template/engine/factory.php b/library/template/engine/factory.php
@@ -57,8 +57,8 @@ public function __construct( ObjectConfig $config)
  protected function _initialize(ObjectConfig $config)
  {
  $config->append(array(
- 'debug' => false,
- 'cache' => false,
+ 'debug' => \Nooku::getInstance()->isDebug(),
+ 'cache' => \Nooku::getInstance()->isCache(),
  'cache_path' => '',
  'engines' => array(
  'lib:template.engine.nooku'

diff --git a/library/template/template.php b/library/template/template.php
@@ -86,7 +86,7 @@ protected function _initialize(ObjectConfig $config)
  'helper' => array($this, 'invoke'),
  'parameters' => array($this, 'getParameters')
  ),
- 'cache' => false,
+ 'cache' => \Nooku::getInstance()->isCache(),
  'cache_namespace' => 'nooku',
  ));
 

diff --git a/library/translator/abstract.php b/library/translator/abstract.php
@@ -75,7 +75,7 @@ protected function _initialize(ObjectConfig $config)
  $config->append(array(
  'locale' => 'en-GB',
  'locale_fallback' => 'en-GB',
- 'cache' => false,
+ 'cache' => \Nooku::getInstance()->isCache(),
  'cache_namespace' => 'nooku',
  'catalogue' => 'default',
  ));
@@ -108,12 +108,12 @@ public static function getInstance(ObjectConfig $config, ObjectManagerInterface
 
  return $instance;
  }
- 
+
  /**
  * Translates a string and handles parameter replacements
  *
  * Parameters are wrapped in curly braces. So {foo} would be replaced with bar given that $parameters['foo'] = 'bar'
- * 
+ *
  * @param string $string String to translate
  * @param array $parameters An array of parameters
  * @return string Translated string