Merge branch 'master' into ValidatorMessages

zendframework · Nov 4, 2013 · 9082749 · 9082749
commit 9082749
Show file tree

Hide file tree

Showing 20 changed files with 52 additions and 69 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -38,7 +38,7 @@ class Config implements Countable, Iterator, ArrayAccess
     protected $count;
 
     /**
-     * Data withing the configuration.
+     * Data within the configuration.
      *
      * @var array
      */

diff --git a/src/Factory.php b/src/Factory.php
@@ -142,8 +142,8 @@ public static function toFile($filename, $config)
             );
         }
 
-        $extension          = substr(strrchr($filename, '.'), 1);
-        $directory          = dirname($filename);
+        $extension = substr(strrchr($filename, '.'), 1);
+        $directory = dirname($filename);
 
         if (!is_dir($directory)) {
             throw new Exception\RuntimeException(
@@ -157,16 +157,16 @@ public static function toFile($filename, $config)
             );
         }
 
-        if (!isset(self::$writerExtensions[$extension])) {
+        if (!isset(static::$writerExtensions[$extension])) {
             throw new Exception\RuntimeException(
                 "Unsupported config file extension: '.{$extension}' for writing."
             );
         }
 
-        $writer = self::$writerExtensions[$extension];
+        $writer = static::$writerExtensions[$extension];
         if (($writer instanceOf Writer\AbstractWriter) === false) {
             $writer = self::getWriterPluginManager()->get($writer);
-            self::$writerExtensions[$extension] = $writer;
+            static::$writerExtensions[$extension] = $writer;
         }
 
         if (is_object($config)) {
@@ -210,7 +210,7 @@ public static function getReaderPluginManager()
      */
     public static function setWriterPluginManager(WriterPluginManager $writers)
     {
-        self::$writers = $writers;
+        static::$writers = $writers;
     }
 
     /**
@@ -272,6 +272,6 @@ public static function registerWriter($extension, $writer)
             ));
         }
 
-        self::$writerExtensions[$extension] = $writer;
+        static::$writerExtensions[$extension] = $writer;
     }
 }
diff --git a/src/WriterPluginManager.php b/src/WriterPluginManager.php
@@ -14,9 +14,9 @@
 class WriterPluginManager extends AbstractPluginManager
 {
     protected $invokableClasses = array(
-        'php'  => 'Zend\Config\Writer\PhpArray',
         'ini'  => 'Zend\Config\Writer\Ini',
         'json' => 'Zend\Config\Writer\Json',
+        'php'  => 'Zend\Config\Writer\PhpArray',
         'yaml' => 'Zend\Config\Writer\Yaml',
         'xml'  => 'Zend\Config\Writer\Xml',
     );

diff --git a/test/ConfigTest.php b/test/ConfigTest.php
@@ -5,17 +5,13 @@
  * @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 ZendTest\Config;
 
 use Zend\Config\Config;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 class ConfigTest extends \PHPUnit_Framework_TestCase

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -5,17 +5,13 @@
  * @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 ZendTest\Config;
 
 use Zend\Config\Factory;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 class FactoryTest extends \PHPUnit_Framework_TestCase

diff --git a/test/ProcessorTest.php b/test/ProcessorTest.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 ZendTest\Config;
@@ -23,9 +22,6 @@
 use Zend\Filter\PregReplace;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 class ProcessorTest extends \PHPUnit_Framework_TestCase
@@ -333,6 +329,10 @@ public function testPHPConstants()
 
     public function testTranslator()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $config     = new Config($this->translatorData, true);
         $translator = new Translator();
         $translator->addTranslationFile('phparray', $this->translatorFile);
@@ -346,6 +346,23 @@ public function testTranslator()
         $this->assertEquals('zwei Hunde', $config->pages[1]->label);
     }
 
+    public function testTranslatorWithoutIntl()
+    {
+        if (extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl enabled');
+        }
+
+        $this->setExpectedException('Zend\I18n\Exception\ExtensionNotLoadedException',
+            'Zend\I18n\Translator component requires the intl PHP extension');
+
+        $config     = new Config($this->translatorData, true);
+        $translator = new Translator();
+        $translator->addTranslationFile('phparray', $this->translatorFile);
+        $processor  = new TranslatorProcessor($translator);
+
+        $processor->process($config);
+    }
+
     public function testTranslatorReadOnly()
     {
         $config     = new Config($this->translatorData, false);
@@ -359,6 +376,26 @@ public function testTranslatorReadOnly()
 
     public function testTranslatorSingleValue()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
+        $translator = new Translator();
+        $translator->addTranslationFile('phparray', $this->translatorFile);
+        $processor  = new TranslatorProcessor($translator);
+
+        $this->assertEquals('ein Hund', $processor->processValue('one dog'));
+    }
+
+    public function testTranslatorSingleValueWithoutIntl()
+    {
+        if (extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl enabled');
+        }
+
+        $this->setExpectedException('Zend\I18n\Exception\ExtensionNotLoadedException',
+            'Zend\I18n\Translator component requires the intl PHP extension');
+
         $translator = new Translator();
         $translator->addTranslationFile('phparray', $this->translatorFile);
         $processor  = new TranslatorProcessor($translator);

diff --git a/test/Reader/AbstractReaderTestCase.php b/test/Reader/AbstractReaderTestCase.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 ZendTest\Config\Reader;
@@ -14,9 +13,6 @@
 use Zend\Config\Reader\ReaderInterface;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 abstract class AbstractReaderTestCase extends TestCase

diff --git a/test/Reader/IniTest.php b/test/Reader/IniTest.php
@@ -5,17 +5,13 @@
  * @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 ZendTest\Config\Reader;
 
 use Zend\Config\Reader\Ini;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 class IniTest extends AbstractReaderTestCase

diff --git a/test/Reader/JsonTest.php b/test/Reader/JsonTest.php
@@ -5,17 +5,13 @@
  * @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 ZendTest\Config\Reader;
 
 use Zend\Config\Reader\Json;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 class JsonTest extends AbstractReaderTestCase

diff --git a/test/Reader/TestAssets/DummyReader.php b/test/Reader/TestAssets/DummyReader.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 ZendTest\Config\Reader\TestAssets;

diff --git a/test/Reader/XmlTest.php b/test/Reader/XmlTest.php
@@ -5,17 +5,13 @@
  * @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 ZendTest\Config\Reader;
 
 use Zend\Config\Reader\Xml;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 class XmlTest extends AbstractReaderTestCase

diff --git a/test/Reader/YamlTest.php b/test/Reader/YamlTest.php
@@ -5,24 +5,19 @@
  * @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 ZendTest\Config\Reader;
 
 use Zend\Config\Reader\Yaml as YamlReader;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 class YamlTest extends AbstractReaderTestCase
 {
     public function setUp()
     {
-
         if (!constant('TESTS_ZEND_CONFIG_YAML_ENABLED')) {
             $this->markTestSkipped('Yaml test for Zend\Config skipped');
         }

diff --git a/test/Writer/AbstractWriterTestCase.php b/test/Writer/AbstractWriterTestCase.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 ZendTest\Config\Writer;
@@ -14,9 +13,6 @@
 use Zend\Config\Config;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 abstract class AbstractWriterTestCase extends TestCase

diff --git a/test/Writer/IniTest.php b/test/Writer/IniTest.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 ZendTest\Config\Writer;
@@ -15,9 +14,6 @@
 use Zend\Config\Reader\Ini as IniReader;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 class IniTest extends AbstractWriterTestCase

diff --git a/test/Writer/JsonTest.php b/test/Writer/JsonTest.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 ZendTest\Config\Writer;
@@ -15,9 +14,6 @@
 use Zend\Config\Reader\Json as JsonReader;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 class JsonTest extends AbstractWriterTestCase

diff --git a/test/Writer/PhpArrayTest.php b/test/Writer/PhpArrayTest.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 ZendTest\Config\Writer;
@@ -15,9 +14,6 @@
 use ZendTest\Config\Writer\TestAssets\PhpReader;
 
 /**
- * @category   Zend
- * @package    Zend_Config
- * @subpackage UnitTests
  * @group      Zend_Config
  */
 class PhpArrayTest extends AbstractWriterTestCase

diff --git a/test/Writer/TestAssets/DummyWriter.php b/test/Writer/TestAssets/DummyWriter.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 ZendTest\Config\Writer\TestAssets;

diff --git a/test/Writer/TestAssets/PhpReader.php b/test/Writer/TestAssets/PhpReader.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 ZendTest\Config\Writer\TestAssets;