Merge branch 'master' of git://github.com/zendframework/zf2

Fixed files permissions
zendframework · Feb 28, 2013 · dc32703 · dc32703
commit dc32703
Show file tree

Hide file tree

Showing 28 changed files with 272 additions and 140 deletions.
diff --git a/composer.json b/composer.json
@@ -33,8 +33,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

diff --git a/src/Config.php b/src/Config.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config;
@@ -21,9 +20,6 @@
  *
  * Implements Countable, Iterator and ArrayAccess
  * to facilitate easy access to the data.
- *
- * @category   Zend
- * @package    Zend_Config
  */
 class Config implements Countable, Iterator, ArrayAccess
 {

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -5,15 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Exception
- */
 interface ExceptionInterface
 {}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,15 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Exception
- */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -5,15 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Exception
- */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/src/Factory.php b/src/Factory.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config;
 
 use Zend\Stdlib\ArrayUtils;
 
-/**
- * @category  Zend
- * @package   Zend_Config
- */
 class Factory
 {
     /**
@@ -25,6 +20,13 @@ class Factory
      */
     public static $readers = null;
 
+    /**
+     * Plugin manager for loading writers
+     *
+     * @var null|WriterPluginManager
+     */
+    public static $writers = null;
+
     /**
      * Registered config file extensions.
      * key is extension, value is reader instance or plugin name
@@ -38,6 +40,19 @@ class Factory
         'yaml' => 'yaml',
     );
 
+    /**
+     * Register config file extensions for writing
+     * key is extension, value is writer instance or plugin name
+     *
+     * @var array
+     */
+    protected static $writerExtensions = array(
+        'php'  => 'php',
+        'ini'  => 'ini',
+        'json' => 'json',
+        'xml'  => 'xml',
+        'yaml' => 'yaml',
+    );
 
     /**
      * Read a config from a file.
@@ -107,10 +122,67 @@ public static function fromFiles(array $files, $returnConfigObject = false)
         return ($returnConfigObject) ? new Config($config) : $config;
     }
 
+    /**
+     * Writes a config to a file
+     *
+     * @param string $filename
+     * @param array|Config $config
+     * @return boolean TRUE on success | FALSE on failure
+     * @throws Exception\RuntimeException
+     * @throws Exception\InvalidArgumentException
+     */
+    public static function toFile($filename, $config)
+    {
+        if (
+            (is_object($config) && !($config instanceOf Config)) ||
+            (!is_object($config) && !is_array($config))
+        ) {
+            throw new Exception\InvalidArgumentException(
+                __METHOD__." \$config should be an array or instance of Zend\\Config\\Config"
+            );
+        }
+
+        $extension          = substr(strrchr($filename, '.'), 1);
+        $directory          = dirname($filename);
+
+        if (!is_dir($directory)) {
+            throw new Exception\RuntimeException(
+                "Directory '{$directory}' does not exists!"
+            );
+        }
+
+        if (!is_writable($directory)) {
+            throw new Exception\RuntimeException(
+                "Cannot write in directory '{$directory}'"
+            );
+        }
+
+        if (!isset(self::$writerExtensions[$extension])) {
+            throw new Exception\RuntimeException(
+                "Unsupported config file extension: '.{$extension}' for writing."
+            );
+        }
+
+        $writer = self::$writerExtensions[$extension];
+        if (($writer instanceOf Writer\AbstractWriter) === false) {
+            $writer = self::getWriterPluginManager()->get($writer);
+            self::$writerExtensions[$extension] = $writer;
+        }
+
+        if (is_object($config)) {
+            $config = $config->toArray();
+        }
+
+        $content = $writer->processConfig($config);
+
+        return (bool) (file_put_contents($filename, $content) !== false);
+    }
+
     /**
      * Set reader plugin manager
      *
      * @param ReaderPluginManager $readers
+     * @return void
      */
     public static function setReaderPluginManager(ReaderPluginManager $readers)
     {
@@ -130,12 +202,38 @@ public static function getReaderPluginManager()
         return static::$readers;
     }
 
+    /**
+     * Set writer plugin manager
+     *
+     * @param WriterPluginManager $writers
+     * @return void
+     */
+    public static function setWriterPluginManager(WriterPluginManager $writers)
+    {
+        self::$writers = $writers;
+    }
+
+    /**
+     * Get the writer plugin manager
+     *
+     * @return WriterPluginManager
+     */
+    public static function getWriterPluginManager()
+    {
+        if (static::$writers === null) {
+            static::$writers = new WriterPluginManager();
+        }
+
+        return static::$writers;
+    }
+
     /**
      * Set config reader for file extension
      *
      * @param  string $extension
      * @param  string|Reader\ReaderInterface $reader
      * @throws Exception\InvalidArgumentException
+     * @return void
      */
     public static function registerReader($extension, $reader)
     {
@@ -152,4 +250,28 @@ public static function registerReader($extension, $reader)
 
         static::$extensions[$extension] = $reader;
     }
+
+    /**
+     * Set config writer for file extension
+     *
+     * @param string $extension
+     * @param string|Writer\AbstractWriter $writer
+     * @throw Exception\InvalidArgumentException
+     * @return void
+     */
+    public static function registerWriter($extension, $writer)
+    {
+        $extension = strtolower($extension);
+
+        if (!is_string($writer) && !$writer instanceof Writer\AbstractWriter) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Writer should be plugin name, class name or ' .
+                'instance of %s\Writer\AbstractWriter; received "%s"',
+                __NAMESPACE__,
+                (is_object($writer) ? get_class($writer) : gettype($writer))
+            ));
+        }
+
+        self::$writerExtensions[$extension] = $writer;
+    }
 }
diff --git a/src/Processor/Constant.php b/src/Processor/Constant.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 class Constant extends Token implements ProcessorInterface
 {
     /**

diff --git a/src/Processor/Filter.php b/src/Processor/Filter.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
@@ -14,11 +13,6 @@
 use Zend\Config\Exception;
 use Zend\Filter\FilterInterface as ZendFilter;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 class Filter implements ProcessorInterface
 {
     /**

diff --git a/src/Processor/ProcessorInterface.php b/src/Processor/ProcessorInterface.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
 
 use Zend\Config\Config;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 interface ProcessorInterface
 {
     /**

diff --git a/src/Processor/Queue.php b/src/Processor/Queue.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
@@ -14,11 +13,6 @@
 use Zend\Config\Exception;
 use Zend\Stdlib\PriorityQueue;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 class Queue extends PriorityQueue implements ProcessorInterface
 {
     /**

diff --git a/src/Processor/Token.php b/src/Processor/Token.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
@@ -14,11 +13,6 @@
 use Zend\Config\Config;
 use Zend\Config\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 class Token implements ProcessorInterface
 {
     /**

diff --git a/src/Processor/Translator.php b/src/Processor/Translator.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Config
  */
 
 namespace Zend\Config\Processor;
@@ -14,11 +13,6 @@
 use Zend\Config\Exception;
 use Zend\I18n\Translator\Translator as ZendTranslator;
 
-/**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage Processor
- */
 class Translator implements ProcessorInterface
 {
     /**