Merge branch 'hotfix/qa-typos-and-optimizations'

Close #189
Close #191
Close #197
Close #199
Close #200

Author: weierophinney

.travis.yml

@@ -15,7 +15,7 @@ cache:
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="satooshi/php-coveralls"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
     - TESTS_ZEND_FORM_ANNOTATION_SUPPORT=true
     - TESTS_ZEND_FORM_RECAPTCHA_SUPPORT=true
 
@@ -78,7 +78,7 @@ script:
   - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
 
 notifications:
   email: false

composer.json

@@ -82,7 +82,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }

docs/book/quick-start.md

@@ -53,7 +53,6 @@ $captcha->setCaptcha(new Captcha\Dumb());
 $captcha->setLabel('Please verify you are human');
 
 // Create a CSRF token:
-$captcha = new Element\Captcha('captcha');
 $csrf = new Element\Csrf('security');
 
 // Create a submit button:

src/Element/Collection.php

@@ -172,7 +172,7 @@ public function setObject($object)
         }
 
         $this->object = $object;
-        $this->count  = count($object) > $this->count ? count($object) : $this->count;
+        $this->count  = max(count($object), $this->count);
 
         return $this;
     }

src/Element/Select.php

@@ -112,7 +112,7 @@ public function unsetValueOption($key)
      * - label: label to associate with the element
      * - label_attributes: attributes to use when the label is rendered
      * - value_options: list of values and labels for the select options
-     * _ empty_option: should an empty option be prepended to the options ?
+     * - empty_option: should an empty option be prepended to the options ?
      *
      * @param  array|Traversable $options
      * @return Select|ElementInterface

src/View/Helper/AbstractHelper.php

@@ -370,9 +370,9 @@ protected function prepareAttributes(array $attributes)
 
             if (! isset($this->validGlobalAttributes[$attribute])
                 && ! isset($this->validTagAttributes[$attribute])
-                && 'data-' != substr($attribute, 0, 5)
-                && 'aria-' != substr($attribute, 0, 5)
-                && 'x-' != substr($attribute, 0, 2)
+                && 0 !== strpos($attribute, 'data-')
+                && 0 !== strpos($attribute, 'aria-')
+                && 0 !== strpos($attribute, 'x-')
             ) {
                 // Invalid attribute for the current tag
                 unset($attributes[$key]);
@@ -434,13 +434,13 @@ protected function translateHtmlAttributeValue($key, $value)
             return $this->getTranslator()->translate($value, $this->getTranslatorTextDomain());
         } else {
             foreach ($this->translatableAttributePrefixes as $prefix) {
-                if (mb_substr($key, 0, mb_strlen($prefix)) === $prefix) {
+                if (0 === mb_strpos($key, $prefix)) {
                     // prefix matches => return translated $value
                     return $this->getTranslator()->translate($value, $this->getTranslatorTextDomain());
                 }
             }
             foreach (self::$defaultTranslatableHtmlAttributePrefixes as $prefix) {
-                if (mb_substr($key, 0, mb_strlen($prefix)) === $prefix) {
+                if (0 === mb_strpos($key, $prefix)) {
                     // default prefix matches => return translated $value
                     return $this->getTranslator()->translate($value, $this->getTranslatorTextDomain());
                 }

src/View/Helper/FormCollection.php

@@ -123,7 +123,7 @@ public function render(ElementInterface $element)
         if ($this->shouldWrap) {
             $attributes = $element->getAttributes();
             unset($attributes['name']);
-            $attributesString = count($attributes) ? ' ' . $this->createAttributesString($attributes) : '';
+            $attributesString = $attributes ? ' ' . $this->createAttributesString($attributes) : '';
 
             $label = $element->getLabel();
             $legend = '';

src/View/Helper/FormRow.php

@@ -141,7 +141,7 @@ public function render(ElementInterface $element, $labelPosition = null)
         }
 
         // Does this element have errors ?
-        if (count($element->getMessages()) > 0 && ! empty($inputErrorClass)) {
+        if ($element->getMessages() && $inputErrorClass) {
             $classAttributes = ($element->hasAttribute('class') ? $element->getAttribute('class') . ' ' : '');
             $classAttributes = $classAttributes . $inputErrorClass;