Fix Travis test and update Scrutinizer config

2014-05-06 17:13:16 +07:00 · 2014-05-06 17:13:16 +07:00 · b3229c6a7b
parent 37152cd459
commit b3229c6a7b
10 changed files with 56 additions and 63 deletions
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@ -7,7 +7,7 @@ before_commands:
 tools:
    external_code_coverage:
        enabled: true
-        timeout: 700
+        timeout: 900
    php_code_coverage:
        enabled: false
        test_command: phpunit -c phpunit.xml.dist
--- a/.travis.yml
+++ b/.travis.yml
@ -1,67 +1,68 @@
 language: php

 php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
+    - 5.3.3
+    - 5.3
+    - 5.4
+    - 5.5
+    - 5.6
+    - hhvm

 matrix:
-  allow_failures:
-    - php: 5.3.3
-    - php: 5.6
-    - php: hhvm
+    allow_failures:
+        - php: 5.3.3
+        - php: 5.6
+        - php: hhvm

 env:
-  global:
-    - secure: "Sq+6bVtnPsu0mWX8DWQ+9bGAjxMcGorksUiHc4YIXEJsuDfVmVlH8tTD547IeCjDAx9MxXerZ2Z4HSjxTB70VEnJPvZMHI/EZn4Ny31YLHEthdZbV5Gd1h0TGp8VOzPKGShvGrtGBX6MvMfgpK4zuieVWbSfdKeecm8ZNLMpUd4="
+    global:
+        - secure: "Sq+6bVtnPsu0mWX8DWQ+9bGAjxMcGorksUiHc4YIXEJsuDfVmVlH8tTD547IeCjDAx9MxXerZ2Z4HSjxTB70VEnJPvZMHI/EZn4Ny31YLHEthdZbV5Gd1h0TGp8VOzPKGShvGrtGBX6MvMfgpK4zuieVWbSfdKeecm8ZNLMpUd4="

 before_script:
-  ## Packages
-  - sudo apt-get -qq update > /dev/null
-  - sudo apt-get -qq install graphviz > /dev/null
-  ## Composer
-  # - curl -s http://getcomposer.org/installer | php
-  # - php composer.phar install --prefer-source
-  - composer self-update
-  - composer require dompdf/dompdf:0.6.*
-  - composer install --prefer-source --dev
-  ## PHP_CodeSniffer
-  - pyrus install pear/PHP_CodeSniffer
-  - phpenv rehash
-  ## PHP Copy/Paste Detector
-  - 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
-  ## PHPLOC
-  #- curl -o phploc.phar https://phar.phpunit.de/phploc.phar
-  ## PHPDocumentor
-  - mkdir -p build/docs
-  - mkdir -p build/coverage
+    ## Packages
+    - sudo apt-get -qq update > /dev/null
+    - sudo apt-get -qq install graphviz > /dev/null
+    ## Composer
+    # - curl -s http://getcomposer.org/installer | php
+    # - php composer.phar install --prefer-source
+    - composer self-update
+    - composer require dompdf/dompdf:0.6.*
+    - composer install --prefer-source --dev
+    ## PHP_CodeSniffer
+    - pyrus install pear/PHP_CodeSniffer
+    - phpenv rehash
+    ## PHP Copy/Paste Detector
+    - 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
+    ## PHPLOC
+    #- curl -o phploc.phar https://phar.phpunit.de/phploc.phar
+    ## PHPDocumentor
+    - mkdir -p build/docs
+    - mkdir -p build/coverage

 script:
-  ## PHP_CodeSniffer
-  - phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
-  ## PHP Copy/Paste Detector
-  - php phpcpd.phar src/ tests/ --verbose
-  ## PHP Mess Detector
-  - phpmd src/,tests/ text unusedcode,naming,design,controversial --exclude pclzip.lib.php
-  ## PHPLOC
-  #- php phploc.phar src/
-  ## PHPUnit
-  - phpunit -c ./ --coverage-text --coverage-html ./build/coverage
-  ## PHPDocumentor
-  - vendor/bin/phpdoc.php -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/PCLZip/*" --template="responsive-twig"
+    ## PHP_CodeSniffer
+    - phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
+    ## PHP Copy/Paste Detector
+    - php phpcpd.phar src/ tests/ --verbose
+    ## PHP Mess Detector
+    - phpmd src/,tests/ text unusedcode,naming,design,controversial --exclude pclzip.lib.php
+    ## PHPLOC
+    #- php phploc.phar src/
+    ## PHPUnit
+    - phpunit -c ./ --coverage-text --coverage-html ./build/coverage
+    ## PHPDocumentor
+    - vendor/bin/phpdoc.php -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/PCLZip/*" --template="responsive-twig"

 after_script:
-  ## PHPDocumentor
-  - bash .travis_shell_after_success.sh
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
+    ## PHPDocumentor
+    - bash .travis_shell_after_success.sh
+    ## Scrutinizer
+    - wget https://scrutinizer-ci.com/ocular.phar
+    - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
--- a/src/PhpWord/Template.php
+++ b/src/PhpWord/Template.php
@ -235,7 +235,6 @@ class Template
    public function cloneBlock($blockname, $clones = 1, $replace = true)
    {
        $xmlBlock = null;
-        $pattern =
        preg_match(
            '/(<\?xml.*)(<w:p.*>\${' . $blockname . '}<\/w:.*?p>)(.*)(<w:p.*\${\/' . $blockname . '}<\/w:.*?p>)/is',
            $this->documentXML,
--- a/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/src/PhpWord/Writer/ODText/Part/Content.php
@ -19,7 +19,6 @@ namespace PhpOffice\PhpWord\Writer\ODText\Part;

 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\Element\Text;
-use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\Media;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Shared\XMLWriter;
--- a/src/PhpWord/Writer/ODText/Part/Meta.php
+++ b/src/PhpWord/Writer/ODText/Part/Meta.php
@ -17,7 +17,6 @@

 namespace PhpOffice\PhpWord\Writer\ODText\Part;

-use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\PhpWord;

 /**
--- a/src/PhpWord/Writer/ODText/Part/Styles.php
+++ b/src/PhpWord/Writer/ODText/Part/Styles.php
@ -17,7 +17,6 @@

 namespace PhpOffice\PhpWord\Writer\ODText\Part;

-use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Style;

--- a/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
@ -17,7 +17,6 @@

 namespace PhpOffice\PhpWord\Writer\Word2007\Part;

-use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\PhpWord;

 /**
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
@ -17,7 +17,6 @@

 namespace PhpOffice\PhpWord\Writer\Word2007\Part;

-use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\PhpWord;

 /**
--- a/src/PhpWord/Writer/Word2007/Part/Document.php
+++ b/src/PhpWord/Writer/Word2007/Part/Document.php
@ -18,7 +18,6 @@
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;

 use PhpOffice\PhpWord\Element\Section;
-use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Shared\XMLWriter;
 use PhpOffice\PhpWord\Writer\Word2007\Style\Section as SectionStyleWriter;
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@ -17,7 +17,6 @@

 namespace PhpOffice\PhpWord\Writer\Word2007\Part;

-use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Shared\XMLWriter;
 use PhpOffice\PhpWord\Style;