Merge remote-tracking branch 'upstream/develop' into fancy-samples

.travis.yml

@@ -17,29 +17,29 @@ before_script:
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --prefer-source
   ## PHP_CodeSniffer
-  - pyrus install pear/PHP_CodeSniffer
-  - phpenv rehash
+  #- pyrus install pear/PHP_CodeSniffer
+  #- phpenv rehash
   ## PHP Copy/Paste Detector
-  - curl -o phpcpd.phar https://phar.phpunit.de/phpcpd.phar
+  #- curl -o phpcpd.phar https://phar.phpunit.de/phpcpd.phar
   ## PHP Mess Detector
-  - pear config-set preferred_state beta
-  - printf "\n" | pecl install imagick
-  - pear channel-discover pear.phpmd.org
-  - pear channel-discover pear.pdepend.org
-  - pear install --alldeps phpmd/PHP_PMD
-  - phpenv rehash
+  #- pear config-set preferred_state beta
+  #- printf "\n" | pecl install imagick
+  #- pear channel-discover pear.phpmd.org
+  #- pear channel-discover pear.pdepend.org
+  #- pear install --alldeps phpmd/PHP_PMD
+  #- phpenv rehash
   ## PHPLOC
-  - curl -o phploc.phar https://phar.phpunit.de/phploc.phar
+  #- curl -o phploc.phar https://phar.phpunit.de/phploc.phar
 
 script:
   ## PHP_CodeSniffer
   ## - phpcs --standard=PSR1 Classes/
   ## - phpcs --standard=PSR2 Classes/
   ## PHP Copy/Paste Detector
-  - php phpcpd.phar --verbose Classes/
+  #- php phpcpd.phar --verbose Classes/
   ## PHP Mess Detector
-  - phpmd Classes/ text unusedcode,naming,design
+  #- phpmd Classes/ text unusedcode,naming,design
   ## PHPLOC
-  - php phploc.phar Classes/
+  #- php phploc.phar Classes/
   ## PHPUnit
   - phpunit -c ./ --coverage-text

Classes/PHPWord/Shared/File.php

@@ -102,12 +102,12 @@ class PHPWord_Shared_File
      * Return the Image Type from a file
      *
      * @param string $filename
-     * @param bool $userFallbackFunction
+     * @param bool $useFallbackFunction
      * @return int|bool
      */
-    public static function imagetype($filename, $userFallbackFunction = false)
+    public static function imagetype($filename, $useFallbackFunction = false)
     {
-        if ($userFallbackFunction || !function_exists('exif_imagetype')) {
+        if ($useFallbackFunction || !function_exists('exif_imagetype')) {
             return self::fallbackImagetype($filename);
         }
 

changelog.txt

@@ -22,6 +22,9 @@
 * @version ##VERSION##, ##DATE##
 **************************************************************************************
 
+Changes in branch for release 0.9.0 :
+- QA:       (Progi1984)                         - Documentation
+
 Changes in branch for release 0.8.1 :
 - Feature:  (bskrtich, gabrielbull)             - Added fallback for computers that do not have exif_imagetype