Merge branch 'hotfix/60' into develop

Forward port #60

Author: Xerkus

docs/book/reader.md

@@ -192,7 +192,7 @@ loading configuration data from a JSON file.
 
 Consider the following JSON configuration file:
 
-```javascript
+```json
 {
   "webhost"  : "www.example.com",
   "database" : {
@@ -224,7 +224,7 @@ specific JSON section or element. This is provided using the special syntax
 `@include`. Suppose we have a JSON file that contains only the database
 configuration:
 
-```javascript
+```json
 {
   "database" : {
     "adapter" : "pdo_mysql",
@@ -240,7 +240,7 @@ configuration:
 
 Now let's include it via another configuration file:
 
-```javascript
+```json
 {
     "webhost"  : "www.example.com",
     "@include" : "database.json"

docs/book/writer.md

@@ -154,7 +154,7 @@ echo $writer->toString($config);
 
 The result of this code is the following XML string:
 
-```markup
+```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <zend-config>
     <production>
@@ -203,22 +203,22 @@ The result of this code is the following PHP script:
 
 ```php
 <?php
-return array (
+return [
   'production' =>
-  array (
+  [
     'webhost' => 'www.example.com',
     'database' =>
-    array (
+    [
       'params' =>
-      array (
+      [
         'host' => 'localhost',
         'username' => 'production',
         'password' => 'secret',
         'dbname' => 'dbproduction',
-      ),
-    ),
-  ),
-);
+      ],
+    ],
+  ],
+];
 ```
 
 You can use the method `toFile()` to save the PHP script to a file.
@@ -251,7 +251,7 @@ echo $writer->toString($config);
 
 The result of this code is the following JSON string:
 
-```javascript
+```json
 {
   "webhost": "www.example.com",
   "database": {

src/AbstractConfigFactory.php

@@ -192,6 +192,6 @@ protected function match($requestedName)
                 return $matches[1];
             }
         }
-        return;
+        return null;
     }
 }

src/Processor/Constant.php

@@ -116,7 +116,7 @@ protected function doProcess($value, array $replacements)
             return parent::doProcess($value, $replacements);
         }
 
-        $class = substr($value, 0, strlen($value) - 7);
+        $class = substr($value, 0, -7);
         if (class_exists($class)) {
             return $class;
         }

src/Reader/Ini.php

@@ -191,9 +191,11 @@ protected function processKey($key, $value, array &$config)
         if (strpos($key, $this->nestSeparator) !== false) {
             $pieces = explode($this->nestSeparator, $key, 2);
 
-            if (! strlen($pieces[0]) || ! strlen($pieces[1])) {
+            if ($pieces[0] === '' || $pieces[1] === '') {
                 throw new Exception\RuntimeException(sprintf('Invalid key "%s"', $key));
-            } elseif (! isset($config[$pieces[0]])) {
+            }
+
+            if (! isset($config[$pieces[0]])) {
                 if ($pieces[0] === '0' && ! empty($config)) {
                     $config = [$pieces[0] => $config];
                 } else {

src/Reader/JavaProperties.php

@@ -138,7 +138,7 @@ protected function parse($string)
         $delimLength = strlen($delimiter);
         $result = [];
         $lines = explode("\n", $string);
-        $key = "";
+        $key = '';
         $isWaitingOtherLine = false;
         foreach ($lines as $i => $line) {
             // Ignore empty lines and commented lines
@@ -159,7 +159,7 @@ protected function parse($string)
 
             // Check if ends with single '\' (indicating another line is expected)
             if (strrpos($value, "\\") === strlen($value) - strlen("\\")) {
-                $value = substr($value, 0, strlen($value) - 1);
+                $value = substr($value, 0, -1);
                 $isWaitingOtherLine = true;
             } else {
                 $isWaitingOtherLine = false;

src/Writer/Ini.php

@@ -143,13 +143,17 @@ protected function prepareValue($value)
     {
         if (is_int($value) || is_float($value)) {
             return $value;
-        } elseif (is_bool($value)) {
+        }
+
+        if (is_bool($value)) {
             return ($value ? 'true' : 'false');
-        } elseif (false === strpos($value, '"')) {
+        }
+
+        if (false === strpos($value, '"')) {
             return '"' . $value .  '"';
-        } else {
-            throw new Exception\RuntimeException('Value can not contain double quotes');
         }
+
+        throw new Exception\RuntimeException('Value can not contain double quotes');
     }
 
     /**