Merge pull request #11 from PHPOffice/develop

Update master branch from develop

Author: Progi1984

.gitignore

@@ -0,0 +1 @@
+unitTests/codeCoverage

.travis.yml

@@ -0,0 +1,40 @@
+language: php
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+
+before_script:
+  ## Composer
+  - curl -s http://getcomposer.org/installer | php
+  - php composer.phar install
+  ## 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
+
+script:
+  ## PHP_CodeSniffer
+  - phpcs --standard=PSR1 Classes/
+  - phpcs --standard=PSR2 Classes/
+  ## PHP Copy/Paste Detector
+  - php phpcpd.phar --verbose Classes/
+  ## PHP Mess Detector
+  - phpmd Classes/ text codesize,unusedcode,naming,design
+  ## PHPLOC
+  - php phploc.phar Classes/
+
+notifications:
+  email:
+    - progi1984@gmail.com

Classes/PHPVisio/IOFactory.php

@@ -120,7 +120,7 @@ public static function addSearchLocation($type = '', $location = '', $classname
 	 * @static
 	 * @access	public
 	 * @param	PHPVisio $phpProject
-	 * @param	string  $writerType	Example: Excel2007
+	 * @param	string  $writerType	Example: MSVisio2007
 	 * @return	PHPVisio_Writer_IWriter
 	 * @throws	Exception
 	 */
@@ -178,7 +178,7 @@ public static function createReader($readerType = '') {
 	 *
 	 * @static
 	 * @access public
-	 * @param 	string 		$pFileName		The name of the spreadsheet file
+	 * @param 	string 		$pFileName		The name of the visio/dia file
 	 * @return	PHPVisio
 	 * @throws	Exception
 	 */
@@ -192,7 +192,7 @@ public static function load($pFilename) {
 	 *
 	 * @static
 	 * @access public
-	 * @param 	string 		$pFileName		The name of the spreadsheet file to identify
+	 * @param 	string 		$pFileName		The name of the visio/dia file to identify
 	 * @return	string
 	 * @throws	Exception
 	 */
@@ -209,7 +209,7 @@ public static function identify($pFilename) {
 	 *
 	 * @static
 	 * @access	public
-	 * @param 	string 		$pFileName		The name of the spreadsheet file
+	 * @param 	string 		$pFileName		The name of the visio/dia file
 	 * @return	PHPVisio_Reader_IReader
 	 * @throws	Exception
 	 */

composer.json

@@ -0,0 +1,30 @@
+{
+    "name": "phpoffice/phpvisio",
+    "description": "PHPVisio - Read, Create and Write Diagrams documents in PHP",
+    "keywords": ["PHP","Visio", "Dia", "vsdx","vsd","diagram"],
+    "homepage": "http://phpoffice.github.io",
+    "type": "library",
+    "license": "LGPL",
+    "authors": [
+        {
+            "name": "Mark Baker"
+        },
+        {
+            "name": "Franck Lefevre",
+            "homepage": "http://blog.rootslabs.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.2.0",
+        "ext-xml": "*"
+    },
+    "recommend": {
+        "ext-zip": "*",
+        "ext-gd2": "*"
+    },
+    "autoload": {
+        "psr-0": {
+            "PHPVisio": "Classes/"
+        }
+    }
+}

unitTests/Classes/PHPVisio/AutoloaderTest.php

@@ -0,0 +1,56 @@
+<?php
+
+
+class AutoloaderTest extends PHPUnit_Framework_TestCase
+{
+
+    public function setUp()
+    {
+        if (!defined('PHPVISIO_ROOT'))
+        {
+            define('PHPVISIO_ROOT', APPLICATION_PATH . '/');
+        }
+        require_once(PHPVISIO_ROOT . 'PHPVisio/Autoloader.php');
+    }
+
+    public function testAutoloaderNonPHPVisioClass()
+    {
+        $className = 'InvalidClass';
+
+        $result = PHPVisio_Autoloader::Load($className);
+        //    Must return a boolean...
+        $this->assertTrue(is_bool($result));
+        //    ... indicating failure
+        $this->assertFalse($result);
+    }
+
+    public function testAutoloaderInvalidPHPVisioClass()
+    {
+        $className = 'PHPVisio_Invalid_Class';
+
+        $result = PHPVisio_Autoloader::Load($className);
+        //    Must return a boolean...
+        $this->assertTrue(is_bool($result));
+        //    ... indicating failure
+        $this->assertFalse($result);
+    }
+
+    public function testAutoloadValidPHPVisioClass()
+    {
+        $className = 'PHPVisio_IOFactory';
+
+        $result = PHPVisio_Autoloader::Load($className);
+        //    Check that class has been loaded
+        $this->assertTrue(class_exists($className));
+    }
+
+    public function testAutoloadInstantiateSuccess()
+    {
+        $result = new PHPVisio(1,2,3);
+        //    Must return an object...
+        $this->assertTrue(is_object($result));
+        //    ... of the correct type
+        $this->assertTrue(is_a($result,'PHPVisio'));
+    }
+
+}

unitTests/bootstrap.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * $Id: bootstrap.php 2892 2011-08-14 15:11:50Z markbaker@PHPVisio.net $
+ *
+ * @copyright   Copyright (C) 2011-2012 PHPVisio. All rights reserved.
+ * @package     PHPVisio
+ * @subpackage  PHPVisio Unit Tests
+ * @author      Mark Baker
+ */
+
+// PHP 5.3 Compat
+date_default_timezone_set('Europe/London');
+
+// Define path to application directory
+defined('APPLICATION_PATH')
+	|| define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../Classes'));
+
+// Define path to application tests directory
+defined('APPLICATION_TESTS_PATH')
+	|| define('APPLICATION_TESTS_PATH', realpath(dirname(__FILE__) ));
+
+// Define application environment
+defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'ci');
+
+// Ensure library/ is on include_path
+set_include_path(implode(PATH_SEPARATOR, array(
+	realpath(APPLICATION_PATH . '/../Classes'),
+	'./',
+	get_include_path(),
+)));
+
+
+/**
+ * @todo Sort out xdebug in vagrant so that this works in all sandboxes
+ * For now, it is safer to test for it rather then remove it.
+ */
+echo "PHPVisio tests beginning\n";
+
+if(extension_loaded('xdebug')) {
+	echo "Xdebug extension loaded and running\n";
+	xdebug_enable();
+} else {
+	echo 'Xdebug not found, you should run the following at the command line: echo "zend_extension=/usr/lib64/php/modules/xdebug.so" > /etc/php.d/xdebug.ini' . "\n";
+}

unitTests/phpunit.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<phpunit bootstrap="./bootstrap.php"
+    backupGlobals="true"
+    colors="true" 
+    convertErrorsToExceptions="true" 
+    convertNoticesToExceptions="true" 
+    convertWarningsToExceptions="true" 
+    processIsolation="false" 
+    syntaxCheck="true" 
+    verbose="true" 
+    strict="true"
+    stopOnError="false"
+    stopOnFailure="false"
+    stopOnIncomplete="false"
+    stopOnSkipped="false">
+    <php>
+        <ini name="memory_limit" value="2048M"/>
+    </php>
+    <testsuite name="PHPVisio Unit Test Suite">
+        <directory suffix="Test.php">./Classes</directory>
+    </testsuite>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">../Classes</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-html" target="./codeCoverage" charset="UTF-8"
+             yui="true" highlight="false"
+             lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-clover" target="./codeCoverage/codeCoverage.xml"/>
+        <log type="metrics-xml" target="./metrics/metrics.xml"/>
+        <log type="test-xml" target="./testResults/logfile.xml" logIncompleteSkipped="false"/>
+    </logging>
+</phpunit>