Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ivan Lanin 2014-03-17 18:31:08 +07:00
commit ef0443361a
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.travis.yml
View File

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

6
Classes/PHPWord/Shared/File.php
View File

@ -102,12 +102,12 @@ class PHPWord_Shared_File
* Return the Image Type from a file * Return the Image Type from a file
* *
* @param string $filename * @param string $filename
* @param bool $userFallbackFunction * @param bool $useFallbackFunction
* @return int|bool * @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); return self::fallbackImagetype($filename);
} }

3
changelog.txt
View File

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