From 15a719c78af351a7b7cf3e390d28c9f23ae8fbbb Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Wed, 27 Aug 2014 10:24:49 +0200
Subject: [PATCH] Cleanup

---
 .gitignore                                    |  10 +-
 .travis.yml                                   |   2 +-
 PHP/Token/Stream/Autoload.php                 | 226 ------------------
 PHP/Token/Stream/Autoload.php.in              |  65 -----
 build.xml                                     | 171 ++-----------
 .../ControlSignatureSniff.php                 |  22 --
 .../Whitespace/ConcatenationSpacingSniff.php  |  22 --
 build/PHPCS/ruleset.xml                       |  35 ---
 build/phpmd.xml                               |  27 ---
 build/phpunit.xml                             |  17 ++
 build/travis-ci.xml                           |  13 -
 composer.json                                 |  15 +-
 package.xml                                   |  69 ------
 phpunit.xml.dist                              |  27 ---
 {PHP => src}/Token.php                        |   0
 {PHP => src}/Token/Stream.php                 |   0
 {PHP => src}/Token/Stream/CachingFactory.php  |   0
 {Tests => tests}/Token/ClassTest.php          |  10 -
 {Tests => tests}/Token/ClosureTest.php        |  10 -
 {Tests => tests}/Token/FunctionTest.php       |  10 -
 {Tests => tests}/Token/IncludeTest.php        |  10 -
 {Tests => tests}/Token/InterfaceTest.php      |  10 -
 {Tests => tests}/Token/NamespaceTest.php      |  10 -
 {Tests => tests}/TokenTest.php                |   9 -
 .../_fixture}/classExtendsNamespacedClass.php |   0
 .../_fixture}/classInNamespace.php            |   0
 .../_fixture}/classInScopedNamespace.php      |   0
 {Tests/_files => tests/_fixture}/closure.php  |   0
 {Tests/_files => tests/_fixture}/issue19.php  |   0
 {Tests/_files => tests/_fixture}/issue30.php  |   0
 ...tipleNamespacesWithOneClassUsingBraces.php |   0
 ...espacesWithOneClassUsingNonBraceSyntax.php |   0
 {Tests/_files => tests/_fixture}/source.php   |   0
 {Tests/_files => tests/_fixture}/source2.php  |   0
 {Tests/_files => tests/_fixture}/source3.php  |   0
 {Tests/_files => tests/_fixture}/source4.php  |   0
 {Tests/_files => tests/_fixture}/source5.php  |   0
 tests/bootstrap.php                           |   7 +
 38 files changed, 56 insertions(+), 741 deletions(-)
 delete mode 100644 PHP/Token/Stream/Autoload.php
 delete mode 100644 PHP/Token/Stream/Autoload.php.in
 delete mode 100644 build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
 delete mode 100644 build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
 delete mode 100644 build/PHPCS/ruleset.xml
 delete mode 100644 build/phpmd.xml
 create mode 100644 build/phpunit.xml
 delete mode 100644 build/travis-ci.xml
 delete mode 100644 package.xml
 delete mode 100644 phpunit.xml.dist
 rename {PHP => src}/Token.php (100%)
 rename {PHP => src}/Token/Stream.php (100%)
 rename {PHP => src}/Token/Stream/CachingFactory.php (100%)
 rename {Tests => tests}/Token/ClassTest.php (94%)
 rename {Tests => tests}/Token/ClosureTest.php (95%)
 rename {Tests => tests}/Token/FunctionTest.php (96%)
 rename {Tests => tests}/Token/IncludeTest.php (94%)
 rename {Tests => tests}/Token/InterfaceTest.php (97%)
 rename {Tests => tests}/Token/NamespaceTest.php (95%)
 rename {Tests => tests}/TokenTest.php (93%)
 rename {Tests/_files => tests/_fixture}/classExtendsNamespacedClass.php (100%)
 rename {Tests/_files => tests/_fixture}/classInNamespace.php (100%)
 rename {Tests/_files => tests/_fixture}/classInScopedNamespace.php (100%)
 rename {Tests/_files => tests/_fixture}/closure.php (100%)
 rename {Tests/_files => tests/_fixture}/issue19.php (100%)
 rename {Tests/_files => tests/_fixture}/issue30.php (100%)
 rename {Tests/_files => tests/_fixture}/multipleNamespacesWithOneClassUsingBraces.php (100%)
 rename {Tests/_files => tests/_fixture}/multipleNamespacesWithOneClassUsingNonBraceSyntax.php (100%)
 rename {Tests/_files => tests/_fixture}/source.php (100%)
 rename {Tests/_files => tests/_fixture}/source2.php (100%)
 rename {Tests/_files => tests/_fixture}/source3.php (100%)
 rename {Tests/_files => tests/_fixture}/source4.php (100%)
 rename {Tests/_files => tests/_fixture}/source5.php (100%)
 create mode 100644 tests/bootstrap.php

diff --git a/.gitignore b/.gitignore
index 26d535f..103eecf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
 /.idea
-build/api
-build/code-browser
-build/coverage
-build/logs
-build/pdepend
-cache.properties
-phpunit.xml
+/composer.lock
+/composer.phar
+/vendor
diff --git a/.travis.yml b/.travis.yml
index 90a2d2b..e1bd2d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ before_script:
   - composer install --no-interaction --prefer-source --dev
 
 script:
-  - phpunit --configuration ./build/travis-ci.xml
+  - ./vendor/bin/phpunit --configuration ./build/phpunit.xml
 
 matrix:
   allow_failures:
diff --git a/PHP/Token/Stream/Autoload.php b/PHP/Token/Stream/Autoload.php
deleted file mode 100644
index 5c8cc21..0000000
--- a/PHP/Token/Stream/Autoload.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- * php-token-stream
- *
- * Copyright (c) 2009-2010, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package   PHP_TokenStream
- * @author    Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2009-2010 Sebastian Bergmann <sebastian@phpunit.de>
- * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link      http://github.com/sebastianbergmann/php-token-stream/tree
- * @since     File available since Release 1.1.0
- */
-
-spl_autoload_register(
-  function ($class)
-  {
-      static $classes = NULL;
-      static $path = NULL;;
-
-      if ($classes === NULL) {
-          $classes = array(
-            'php_token' => '/Token.php',
-            'php_token_abstract' => '/Token.php',
-            'php_token_ampersand' => '/Token.php',
-            'php_token_and_equal' => '/Token.php',
-            'php_token_array' => '/Token.php',
-            'php_token_array_cast' => '/Token.php',
-            'php_token_as' => '/Token.php',
-            'php_token_at' => '/Token.php',
-            'php_token_backtick' => '/Token.php',
-            'php_token_bad_character' => '/Token.php',
-            'php_token_bool_cast' => '/Token.php',
-            'php_token_boolean_and' => '/Token.php',
-            'php_token_boolean_or' => '/Token.php',
-            'php_token_break' => '/Token.php',
-            'php_token_callable' => '/Token.php',
-            'php_token_caret' => '/Token.php',
-            'php_token_case' => '/Token.php',
-            'php_token_catch' => '/Token.php',
-            'php_token_character' => '/Token.php',
-            'php_token_class' => '/Token.php',
-            'php_token_class_c' => '/Token.php',
-            'php_token_clone' => '/Token.php',
-            'php_token_close_bracket' => '/Token.php',
-            'php_token_close_curly' => '/Token.php',
-            'php_token_close_square' => '/Token.php',
-            'php_token_close_tag' => '/Token.php',
-            'php_token_colon' => '/Token.php',
-            'php_token_comma' => '/Token.php',
-            'php_token_comment' => '/Token.php',
-            'php_token_concat_equal' => '/Token.php',
-            'php_token_const' => '/Token.php',
-            'php_token_constant_encapsed_string' => '/Token.php',
-            'php_token_continue' => '/Token.php',
-            'php_token_curly_open' => '/Token.php',
-            'php_token_dec' => '/Token.php',
-            'php_token_declare' => '/Token.php',
-            'php_token_default' => '/Token.php',
-            'php_token_dir' => '/Token.php',
-            'php_token_div' => '/Token.php',
-            'php_token_div_equal' => '/Token.php',
-            'php_token_dnumber' => '/Token.php',
-            'php_token_do' => '/Token.php',
-            'php_token_doc_comment' => '/Token.php',
-            'php_token_dollar' => '/Token.php',
-            'php_token_dollar_open_curly_braces' => '/Token.php',
-            'php_token_dot' => '/Token.php',
-            'php_token_double_arrow' => '/Token.php',
-            'php_token_double_cast' => '/Token.php',
-            'php_token_double_colon' => '/Token.php',
-            'php_token_double_quotes' => '/Token.php',
-            'php_token_echo' => '/Token.php',
-            'php_token_else' => '/Token.php',
-            'php_token_elseif' => '/Token.php',
-            'php_token_empty' => '/Token.php',
-            'php_token_encapsed_and_whitespace' => '/Token.php',
-            'php_token_end_heredoc' => '/Token.php',
-            'php_token_enddeclare' => '/Token.php',
-            'php_token_endfor' => '/Token.php',
-            'php_token_endforeach' => '/Token.php',
-            'php_token_endif' => '/Token.php',
-            'php_token_endswitch' => '/Token.php',
-            'php_token_endwhile' => '/Token.php',
-            'php_token_equal' => '/Token.php',
-            'php_token_eval' => '/Token.php',
-            'php_token_exclamation_mark' => '/Token.php',
-            'php_token_exit' => '/Token.php',
-            'php_token_extends' => '/Token.php',
-            'php_token_file' => '/Token.php',
-            'php_token_final' => '/Token.php',
-            'php_token_for' => '/Token.php',
-            'php_token_foreach' => '/Token.php',
-            'php_token_func_c' => '/Token.php',
-            'php_token_function' => '/Token.php',
-            'php_token_global' => '/Token.php',
-            'php_token_goto' => '/Token.php',
-            'php_token_gt' => '/Token.php',
-            'php_token_halt_compiler' => '/Token.php',
-            'php_token_if' => '/Token.php',
-            'php_token_implements' => '/Token.php',
-            'php_token_inc' => '/Token.php',
-            'php_token_include' => '/Token.php',
-            'php_token_include_once' => '/Token.php',
-            'php_token_includes' => '/Token.php',
-            'php_token_inline_html' => '/Token.php',
-            'php_token_instanceof' => '/Token.php',
-            'php_token_insteadof' => '/Token.php',
-            'php_token_int_cast' => '/Token.php',
-            'php_token_interface' => '/Token.php',
-            'php_token_is_equal' => '/Token.php',
-            'php_token_is_greater_or_equal' => '/Token.php',
-            'php_token_is_identical' => '/Token.php',
-            'php_token_is_not_equal' => '/Token.php',
-            'php_token_is_not_identical' => '/Token.php',
-            'php_token_is_smaller_or_equal' => '/Token.php',
-            'php_token_isset' => '/Token.php',
-            'php_token_line' => '/Token.php',
-            'php_token_list' => '/Token.php',
-            'php_token_lnumber' => '/Token.php',
-            'php_token_logical_and' => '/Token.php',
-            'php_token_logical_or' => '/Token.php',
-            'php_token_logical_xor' => '/Token.php',
-            'php_token_lt' => '/Token.php',
-            'php_token_method_c' => '/Token.php',
-            'php_token_minus' => '/Token.php',
-            'php_token_minus_equal' => '/Token.php',
-            'php_token_mod_equal' => '/Token.php',
-            'php_token_mul_equal' => '/Token.php',
-            'php_token_mult' => '/Token.php',
-            'php_token_namespace' => '/Token.php',
-            'php_token_new' => '/Token.php',
-            'php_token_ns_c' => '/Token.php',
-            'php_token_ns_separator' => '/Token.php',
-            'php_token_num_string' => '/Token.php',
-            'php_token_object_cast' => '/Token.php',
-            'php_token_object_operator' => '/Token.php',
-            'php_token_open_bracket' => '/Token.php',
-            'php_token_open_curly' => '/Token.php',
-            'php_token_open_square' => '/Token.php',
-            'php_token_open_tag' => '/Token.php',
-            'php_token_open_tag_with_echo' => '/Token.php',
-            'php_token_or_equal' => '/Token.php',
-            'php_token_paamayim_nekudotayim' => '/Token.php',
-            'php_token_percent' => '/Token.php',
-            'php_token_pipe' => '/Token.php',
-            'php_token_plus' => '/Token.php',
-            'php_token_plus_equal' => '/Token.php',
-            'php_token_print' => '/Token.php',
-            'php_token_private' => '/Token.php',
-            'php_token_protected' => '/Token.php',
-            'php_token_public' => '/Token.php',
-            'php_token_question_mark' => '/Token.php',
-            'php_token_require' => '/Token.php',
-            'php_token_require_once' => '/Token.php',
-            'php_token_return' => '/Token.php',
-            'php_token_semicolon' => '/Token.php',
-            'php_token_sl' => '/Token.php',
-            'php_token_sl_equal' => '/Token.php',
-            'php_token_sr' => '/Token.php',
-            'php_token_sr_equal' => '/Token.php',
-            'php_token_start_heredoc' => '/Token.php',
-            'php_token_static' => '/Token.php',
-            'php_token_stream' => '/Token/Stream.php',
-            'php_token_stream_cachingfactory' => '/Token/Stream/CachingFactory.php',
-            'php_token_string' => '/Token.php',
-            'php_token_string_cast' => '/Token.php',
-            'php_token_string_varname' => '/Token.php',
-            'php_token_switch' => '/Token.php',
-            'php_token_throw' => '/Token.php',
-            'php_token_tilde' => '/Token.php',
-            'php_token_trait' => '/Token.php',
-            'php_token_trait_c' => '/Token.php',
-            'php_token_try' => '/Token.php',
-            'php_token_unset' => '/Token.php',
-            'php_token_unset_cast' => '/Token.php',
-            'php_token_use' => '/Token.php',
-            'php_token_var' => '/Token.php',
-            'php_token_variable' => '/Token.php',
-            'php_token_while' => '/Token.php',
-            'php_token_whitespace' => '/Token.php',
-            'php_token_xor_equal' => '/Token.php',
-            'php_tokenwithscope' => '/Token.php',
-            'php_tokenwithscopeandvisibility' => '/Token.php'
-          );
-
-          $path = dirname(dirname(dirname(__FILE__)));
-      }
-
-      $cn = strtolower($class);
-
-      if (isset($classes[$cn])) {
-          require $path . $classes[$cn];
-      }
-  }
-);
diff --git a/PHP/Token/Stream/Autoload.php.in b/PHP/Token/Stream/Autoload.php.in
deleted file mode 100644
index 1cb3981..0000000
--- a/PHP/Token/Stream/Autoload.php.in
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * php-token-stream
- *
- * Copyright (c) 2009-2010, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package   PHP_TokenStream
- * @author    Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2009-2010 Sebastian Bergmann <sebastian@phpunit.de>
- * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link      http://github.com/sebastianbergmann/php-token-stream/tree
- * @since     File available since Release 1.1.0
- */
-
-spl_autoload_register(
-  function ($class)
-  {
-      static $classes = NULL;
-      static $path = NULL;;
-
-      if ($classes === NULL) {
-          $classes = array(
-            ___CLASSLIST___
-          );
-
-          $path = dirname(dirname(dirname(__FILE__)));
-      }
-
-      $cn = strtolower($class);
-
-      if (isset($classes[$cn])) {
-          require $path . $classes[$cn];
-      }
-  }
-);
diff --git a/build.xml b/build.xml
index aca1cef..f02f4b5 100644
--- a/build.xml
+++ b/build.xml
@@ -1,162 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<project name="PHP_TokenStream" default="build">
- <property name="php" value="php"/>
- <property name="phpunit" value="phpunit"/>
-
- <target name="build"
-   depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpunit,phpcb"/>
-
- <target name="build-parallel"
-   depends="prepare,lint,tools-parallel,phpunit,phpcb"/>
-
- <target name="tools-parallel"
-         description="Run tools in parallel">
-  <parallel threadCount="2">
-   <sequential>
-    <antcall target="pdepend"/>
-    <antcall target="phpmd-ci"/>
-   </sequential>
-   <antcall target="phpcpd"/>
-   <antcall target="phpcs-ci"/>
-   <antcall target="phploc"/>
-  </parallel>
- </target>
-
+<project name="php-token-stream">
  <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/build/api"/>
-  <delete dir="${basedir}/build/code-browser"/>
-  <delete dir="${basedir}/build/coverage"/>
-  <delete dir="${basedir}/build/logs"/>
-  <delete dir="${basedir}/build/pdepend"/>
- </target>
-
- <target name="prepare" depends="clean,phpab"
-         description="Prepare for build">
-  <mkdir dir="${basedir}/build/api"/>
-  <mkdir dir="${basedir}/build/code-browser"/>
-  <mkdir dir="${basedir}/build/coverage"/>
-  <mkdir dir="${basedir}/build/logs"/>
-  <mkdir dir="${basedir}/build/pdepend"/>
- </target>
-
- <target name="phpab" description="Generate autoloader scripts">
-  <exec executable="phpab">
-   <arg value="--output" />
-   <arg path="PHP/Token/Stream/Autoload.php" />
-   <arg value="--template" />
-   <arg path="PHP/Token/Stream/Autoload.php.in" />
-   <arg value="--indent" />
-   <arg value="            " />
-   <arg path="PHP" />
-  </exec>
- </target>
-
- <target name="lint">
-  <apply executable="${php}" failonerror="true">
-   <arg value="-l" />
-
-   <fileset dir="${basedir}/PHP">
-    <include name="**/*.php" />
-    <modified />
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
    </fileset>
+  </delete>
 
-   <fileset dir="${basedir}/Tests">
-    <include name="**/*.php" />
-    <modified />
-   </fileset>
-  </apply>
- </target>
-
- <target name="phploc" description="Measure project size using PHPLOC">
-  <exec executable="phploc">
-   <arg value="--log-csv" />
-   <arg value="${basedir}/build/logs/phploc.csv" />
-   <arg path="${basedir}/PHP" />
-  </exec>
- </target>
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
 
- <target name="pdepend"
-         description="Calculate software metrics using PHP_Depend">
-  <exec executable="pdepend">
-   <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
-   <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
-   <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-   <arg path="${basedir}/PHP" />
-  </exec>
- </target>
-
- <target name="phpmd"
-         description="Perform project mess detection using PHPMD">
-  <exec executable="phpmd">
-   <arg path="${basedir}/PHP" />
-   <arg value="text" />
-   <arg value="${basedir}/build/phpmd.xml" />
-  </exec>
- </target>
-
- <target name="phpmd-ci"
-         description="Perform project mess detection using PHPMD">
-  <exec executable="phpmd">
-   <arg path="${basedir}/PHP" />
-   <arg value="xml" />
-   <arg value="${basedir}/build/phpmd.xml" />
-   <arg value="--reportfile" />
-   <arg value="${basedir}/build/logs/pmd.xml" />
-  </exec>
- </target>
-
- <target name="phpcs"
-         description="Find coding standard violations using PHP_CodeSniffer">
-  <exec executable="phpcs">
-   <arg value="--standard=${basedir}/build/PHPCS" />
-   <arg value="--extensions=php" />
-   <arg value="--ignore=Autoload.php" />
-   <arg path="${basedir}/PHP" />
-   <arg path="${basedir}/Tests" />
-  </exec>
- </target>
-
- <target name="phpcs-ci"
-         description="Find coding standard violations using PHP_CodeSniffer">
-  <exec executable="phpcs" output="/dev/null">
-   <arg value="--report=checkstyle" />
-   <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
-   <arg value="--standard=${basedir}/build/PHPCS" />
-   <arg value="--extensions=php" />
-   <arg value="--ignore=Autoload.php" />
-   <arg path="${basedir}/PHP" />
-   <arg path="${basedir}/Tests" />
-  </exec>
- </target>
-
- <target name="phpcpd" description="Find duplicate code using PHPCPD">
-  <exec executable="phpcpd">
-   <arg value="--log-pmd" />
-   <arg value="${basedir}/build/logs/pmd-cpd.xml" />
-   <arg path="${basedir}/PHP" />
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
   </exec>
  </target>
 
  <target name="phpunit" description="Run unit tests with PHPUnit">
-  <condition property="phpunit_cmd" value="${php} ${phpunit}" else="${phpunit}">
-   <not>
-    <equals arg1="${phpunit}" arg2="phpunit" />
-   </not>
-  </condition>
-
-  <exec executable="${phpunit_cmd}" failonerror="true"/>
- </target>
-
- <target name="phpcb"
-         description="Aggregate tool output with PHP_CodeBrowser">
-  <exec executable="phpcb">
-   <arg value="--log" />
-   <arg path="${basedir}/build/logs" />
-   <arg value="--source" />
-   <arg path="${basedir}/PHP" />
-   <arg value="--output" />
-   <arg path="${basedir}/build/code-browser" />
+  <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
+   <arg value="--configuration"/>
+   <arg path="${basedir}/build/phpunit.xml"/>
   </exec>
  </target>
 </project>
diff --git a/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php b/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
deleted file mode 100644
index bf9d520..0000000
--- a/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-class PHPCS_Sniffs_ControlStructures_ControlSignatureSniff extends PHP_CodeSniffer_Standards_AbstractPatternSniff
-{
-    public function __construct()
-    {
-        parent::__construct(true);
-    }
-
-    protected function getPatterns()
-    {
-        return array(
-          'do {EOL...} while (...);EOL',
-          'while (...) {EOL',
-          'for (...) {EOL',
-          'if (...) {EOL',
-          'foreach (...) {EOL',
-          '}EOLelse if (...) {EOL',
-          '}EOLelse {EOL',
-          'do {EOL',
-        );
-    }
-}
diff --git a/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php b/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
deleted file mode 100644
index e91d6c6..0000000
--- a/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-class PHPCS_Sniffs_Whitespace_ConcatenationSpacingSniff implements PHP_CodeSniffer_Sniff
-{
-    public function register()
-    {
-        return array(T_STRING_CONCAT);
-    }
-
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if ($tokens[($stackPtr - 1)]['code'] !== T_WHITESPACE ||
-            $tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE) {
-
-            $phpcsFile->addError(
-              'Concatenation operator must be surrounded by whitespace',
-              $stackPtr
-            );
-        }
-    }
-}
diff --git a/build/PHPCS/ruleset.xml b/build/PHPCS/ruleset.xml
deleted file mode 100644
index 402f214..0000000
--- a/build/PHPCS/ruleset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Sebastian">
- <description>Sebastian Bergmann's coding standard</description>
-
- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
- <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
- <rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
- <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
- <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
- <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
-
- <rule ref="Generic.Commenting.Todo"/>
-
- <rule ref="Generic.ControlStructures.InlineControlStructure"/>
-
- <rule ref="Generic.Files.LineEndings"/>
-
- <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
- <rule ref="Generic.Formatting.NoSpaceAfterCast"/>
-
- <rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman"/>
- <rule ref="PEAR.Functions.ValidDefaultValue"/>
-
- <rule ref="Generic.NamingConventions.ConstructorName"/>
- <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
- <rule ref="PEAR.NamingConventions.ValidClassName"/>
-
- <rule ref="Generic.PHP.DisallowShortOpenTag"/>
- <rule ref="Generic.PHP.NoSilencedErrors"/>
- <rule ref="Generic.PHP.UpperCaseConstant"/>
-
- <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
- <rule ref="Generic.WhiteSpace.ScopeIndent"/>
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
-</ruleset>
diff --git a/build/phpmd.xml b/build/phpmd.xml
deleted file mode 100644
index 23ecb8b..0000000
--- a/build/phpmd.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<ruleset name="Sebastian"
-         xmlns="http://pmd.sf.net/ruleset/1.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-  <description>Sebastian Bergmann's ruleset</description>
-
-  <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
-  <rule ref="rulesets/codesize.xml/NPathComplexity" />
-  <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity" />
-  <rule ref="rulesets/codesize.xml/ExcessiveClassLength" />
-  <rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
-  <rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
-
-  <rule ref="rulesets/design.xml/EvalExpression" />
-  <rule ref="rulesets/design.xml/ExitExpression" />
-  <rule ref="rulesets/design.xml/GotoStatement" />
-
-  <rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass" />
-
-  <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter" />
-  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField" />
-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
-</ruleset>
diff --git a/build/phpunit.xml b/build/phpunit.xml
new file mode 100644
index 0000000..139586d
--- /dev/null
+++ b/build/phpunit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="../tests/bootstrap.php"
+         verbode="true">
+  <testsuites>
+    <testsuite name="php-token-stream">
+      <directory suffix="Test.php">../tests</directory>
+    </testsuite>
+  </testsuites>
+
+  <filter>
+    <whitelist addUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">../src</directory>
+    </whitelist>
+  </filter>
+</phpunit>
diff --git a/build/travis-ci.xml b/build/travis-ci.xml
deleted file mode 100644
index 3085519..0000000
--- a/build/travis-ci.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         syntaxCheck="false"
-         bootstrap="../PHP/Token/Stream/Autoload.php"
-         strict="true">
-  <testsuites>
-    <testsuite name="php-token-stream">
-      <directory suffix="Test.php">../Tests</directory>
-    </testsuite>
-  </testsuites>
-</phpunit>
diff --git a/composer.json b/composer.json
index 1ac0cee..9c1c700 100644
--- a/composer.json
+++ b/composer.json
@@ -2,29 +2,28 @@
     "name": "phpunit/php-token-stream",
     "description": "Wrapper around PHP's tokenizer extension.",
     "type": "library",
-    "keywords": [
-        "tokenizer"
-    ],
+    "keywords": ["tokenizer"],
     "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
     "license": "BSD-3-Clause",
     "authors": [
         {
             "name": "Sebastian Bergmann",
-            "email": "sb@sebastian-bergmann.de",
-            "role": "lead"
+            "email": "sebastian@phpunit.de"
         }
     ],
     "support": {
-        "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-        "irc": "irc://irc.freenode.net/phpunit"
+        "issues": "https://github.com/sebastianbergmann/php-token-stream/issues"
     },
     "require": {
         "php": ">=5.3.3",
         "ext-tokenizer": "*"
     },
+    "require-dev": {
+        "phpunit/phpunit": "~4.2"
+    },
     "autoload": {
         "classmap": [
-            "PHP/"
+            "src/"
         ]
     },
     "extra": {
diff --git a/package.xml b/package.xml
deleted file mode 100644
index 820638a..0000000
--- a/package.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.4.10" version="2.0"
-  xmlns="http://pear.php.net/dtd/package-2.0"
-  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-                      http://pear.php.net/dtd/tasks-1.0.xsd
-                      http://pear.php.net/dtd/package-2.0
-                      http://pear.php.net/dtd/package-2.0.xsd">
- <name>PHP_TokenStream</name>
- <channel>pear.phpunit.de</channel>
- <summary>Wrapper around PHP's tokenizer extension.</summary>
- <description>Wrapper around PHP's tokenizer extension.</description>
- <lead>
-  <name>Sebastian Bergmann</name>
-  <user>sb</user>
-  <email>sb@sebastian-bergmann.de</email>
-  <active>yes</active>
- </lead>
- <date>2014-03-03</date>
- <version>
-  <release>1.2.2</release>
-  <api>1.2.0</api>
- </version>
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
- <license>The BSD 3-Clause License</license>
- <notes>http://github.com/sebastianbergmann/php-token-stream/tree</notes>
- <contents>
-  <dir name="/">
-   <dir name="PHP">
-    <dir name="Token">
-     <dir name="Stream">
-      <file baseinstalldir="/" name="Autoload.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-      <file baseinstalldir="/" name="CachingFactory.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-     </dir>
-     <file baseinstalldir="/" name="Stream.php" role="php">
-      <tasks:replace from="@package_version@" to="version" type="package-info" />
-     </file>
-    </dir>
-    <file baseinstalldir="/" name="Token.php" role="php">
-     <tasks:replace from="@package_version@" to="version" type="package-info" />
-    </file>
-   </dir>
-   <file baseinstalldir="/" name="LICENSE" role="doc"/>
-   <file baseinstalldir="/" name="README.md" role="doc"/>
-  </dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.3.3</min>
-   </php>
-   <pearinstaller>
-    <min>1.9.4</min>
-   </pearinstaller>
-   <extension>
-    <name>tokenizer</name>
-   </extension>
-  </required>
- </dependencies>
- <phprelease/>
-</package>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index 6d307c4..0000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         syntaxCheck="false"
-         bootstrap="PHP/Token/Stream/Autoload.php"
-         strict="true">
-  <testsuites>
-    <testsuite name="php-token-stream">
-      <directory suffix="Test.php">Tests</directory>
-    </testsuite>
-  </testsuites>
-
-  <logging>
-    <log type="coverage-html" target="build/coverage" title="PHP_TokenStream"
-         charset="UTF-8" yui="true" highlight="true"
-         lowUpperBound="35" highLowerBound="70"/>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-    <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
-  </logging>
-
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">PHP</directory>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/PHP/Token.php b/src/Token.php
similarity index 100%
rename from PHP/Token.php
rename to src/Token.php
diff --git a/PHP/Token/Stream.php b/src/Token/Stream.php
similarity index 100%
rename from PHP/Token/Stream.php
rename to src/Token/Stream.php
diff --git a/PHP/Token/Stream/CachingFactory.php b/src/Token/Stream/CachingFactory.php
similarity index 100%
rename from PHP/Token/Stream/CachingFactory.php
rename to src/Token/Stream/CachingFactory.php
diff --git a/Tests/Token/ClassTest.php b/tests/Token/ClassTest.php
similarity index 94%
rename from Tests/Token/ClassTest.php
rename to tests/Token/ClassTest.php
index f7230cc..afcd1a1 100644
--- a/Tests/Token/ClassTest.php
+++ b/tests/Token/ClassTest.php
@@ -42,16 +42,6 @@
  * @since      File available since Release 1.0.2
  */
 
-if (!defined('TEST_FILES_PATH')) {
-    define(
-      'TEST_FILES_PATH',
-      dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR .
-      '_files' . DIRECTORY_SEPARATOR
-    );
-}
-
-require_once 'PHP/Token/Stream.php';
-
 /**
  * Tests for the PHP_Token_CLASS class.
  *
diff --git a/Tests/Token/ClosureTest.php b/tests/Token/ClosureTest.php
similarity index 95%
rename from Tests/Token/ClosureTest.php
rename to tests/Token/ClosureTest.php
index 5c65092..895529a 100644
--- a/Tests/Token/ClosureTest.php
+++ b/tests/Token/ClosureTest.php
@@ -42,16 +42,6 @@
  * @since      File available since Release 1.0.0
  */
 
-if (!defined('TEST_FILES_PATH')) {
-    define(
-      'TEST_FILES_PATH',
-      dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR .
-      '_files' . DIRECTORY_SEPARATOR
-    );
-}
-
-require_once 'PHP/Token/Stream.php';
-
 /**
  * Tests for the PHP_Token_FUNCTION class.
  *
diff --git a/Tests/Token/FunctionTest.php b/tests/Token/FunctionTest.php
similarity index 96%
rename from Tests/Token/FunctionTest.php
rename to tests/Token/FunctionTest.php
index 988d962..d43abaa 100644
--- a/Tests/Token/FunctionTest.php
+++ b/tests/Token/FunctionTest.php
@@ -42,16 +42,6 @@
  * @since      File available since Release 1.0.0
  */
 
-if (!defined('TEST_FILES_PATH')) {
-    define(
-      'TEST_FILES_PATH',
-      dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR .
-      '_files' . DIRECTORY_SEPARATOR
-    );
-}
-
-require_once 'PHP/Token/Stream.php';
-
 /**
  * Tests for the PHP_Token_FUNCTION class.
  *
diff --git a/Tests/Token/IncludeTest.php b/tests/Token/IncludeTest.php
similarity index 94%
rename from Tests/Token/IncludeTest.php
rename to tests/Token/IncludeTest.php
index fc5ec09..440e1fa 100644
--- a/Tests/Token/IncludeTest.php
+++ b/tests/Token/IncludeTest.php
@@ -42,16 +42,6 @@
  * @since      File available since Release 1.0.2
  */
 
-if (!defined('TEST_FILES_PATH')) {
-    define(
-      'TEST_FILES_PATH',
-      dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR .
-      '_files' . DIRECTORY_SEPARATOR
-    );
-}
-
-require_once 'PHP/Token/Stream.php';
-
 /**
  * Tests for the PHP_Token_REQUIRE_ONCE, PHP_Token_REQUIRE
  * PHP_Token_INCLUDE_ONCE and PHP_Token_INCLUDE_ONCE classes.
diff --git a/Tests/Token/InterfaceTest.php b/tests/Token/InterfaceTest.php
similarity index 97%
rename from Tests/Token/InterfaceTest.php
rename to tests/Token/InterfaceTest.php
index 40e71c0..ebe1f63 100644
--- a/Tests/Token/InterfaceTest.php
+++ b/tests/Token/InterfaceTest.php
@@ -43,16 +43,6 @@
  * @since      File available since Release 1.0.0
  */
 
-if (!defined('TEST_FILES_PATH')) {
-    define(
-      'TEST_FILES_PATH',
-      dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR .
-      '_files' . DIRECTORY_SEPARATOR
-    );
-}
-
-require_once 'PHP/Token/Stream.php';
-
 /**
  * Tests for the PHP_Token_INTERFACE class.
  *
diff --git a/Tests/Token/NamespaceTest.php b/tests/Token/NamespaceTest.php
similarity index 95%
rename from Tests/Token/NamespaceTest.php
rename to tests/Token/NamespaceTest.php
index aedd962..7a0bb7c 100644
--- a/Tests/Token/NamespaceTest.php
+++ b/tests/Token/NamespaceTest.php
@@ -42,16 +42,6 @@
  * @since      File available since Release 1.0.0
  */
 
-if (!defined('TEST_FILES_PATH')) {
-    define(
-      'TEST_FILES_PATH',
-      dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR .
-      '_files' . DIRECTORY_SEPARATOR
-    );
-}
-
-require_once 'PHP/Token/Stream.php';
-
 /**
  * Tests for the PHP_Token_NAMESPACE class.
  *
diff --git a/Tests/TokenTest.php b/tests/TokenTest.php
similarity index 93%
rename from Tests/TokenTest.php
rename to tests/TokenTest.php
index bbad1ef..b0b3d03 100644
--- a/Tests/TokenTest.php
+++ b/tests/TokenTest.php
@@ -42,15 +42,6 @@
  * @since      File available since Release 1.0.0
  */
 
-if (!defined('TEST_FILES_PATH')) {
-    define(
-      'TEST_FILES_PATH',
-      dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR
-    );
-}
-
-require_once 'PHP/Token/Stream.php';
-
 /**
  * Tests for the PHP_Token class.
  *
diff --git a/Tests/_files/classExtendsNamespacedClass.php b/tests/_fixture/classExtendsNamespacedClass.php
similarity index 100%
rename from Tests/_files/classExtendsNamespacedClass.php
rename to tests/_fixture/classExtendsNamespacedClass.php
diff --git a/Tests/_files/classInNamespace.php b/tests/_fixture/classInNamespace.php
similarity index 100%
rename from Tests/_files/classInNamespace.php
rename to tests/_fixture/classInNamespace.php
diff --git a/Tests/_files/classInScopedNamespace.php b/tests/_fixture/classInScopedNamespace.php
similarity index 100%
rename from Tests/_files/classInScopedNamespace.php
rename to tests/_fixture/classInScopedNamespace.php
diff --git a/Tests/_files/closure.php b/tests/_fixture/closure.php
similarity index 100%
rename from Tests/_files/closure.php
rename to tests/_fixture/closure.php
diff --git a/Tests/_files/issue19.php b/tests/_fixture/issue19.php
similarity index 100%
rename from Tests/_files/issue19.php
rename to tests/_fixture/issue19.php
diff --git a/Tests/_files/issue30.php b/tests/_fixture/issue30.php
similarity index 100%
rename from Tests/_files/issue30.php
rename to tests/_fixture/issue30.php
diff --git a/Tests/_files/multipleNamespacesWithOneClassUsingBraces.php b/tests/_fixture/multipleNamespacesWithOneClassUsingBraces.php
similarity index 100%
rename from Tests/_files/multipleNamespacesWithOneClassUsingBraces.php
rename to tests/_fixture/multipleNamespacesWithOneClassUsingBraces.php
diff --git a/Tests/_files/multipleNamespacesWithOneClassUsingNonBraceSyntax.php b/tests/_fixture/multipleNamespacesWithOneClassUsingNonBraceSyntax.php
similarity index 100%
rename from Tests/_files/multipleNamespacesWithOneClassUsingNonBraceSyntax.php
rename to tests/_fixture/multipleNamespacesWithOneClassUsingNonBraceSyntax.php
diff --git a/Tests/_files/source.php b/tests/_fixture/source.php
similarity index 100%
rename from Tests/_files/source.php
rename to tests/_fixture/source.php
diff --git a/Tests/_files/source2.php b/tests/_fixture/source2.php
similarity index 100%
rename from Tests/_files/source2.php
rename to tests/_fixture/source2.php
diff --git a/Tests/_files/source3.php b/tests/_fixture/source3.php
similarity index 100%
rename from Tests/_files/source3.php
rename to tests/_fixture/source3.php
diff --git a/Tests/_files/source4.php b/tests/_fixture/source4.php
similarity index 100%
rename from Tests/_files/source4.php
rename to tests/_fixture/source4.php
diff --git a/Tests/_files/source5.php b/tests/_fixture/source5.php
similarity index 100%
rename from Tests/_files/source5.php
rename to tests/_fixture/source5.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..f92b7df
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+require __DIR__ . '/../vendor/autoload.php';
+
+define(
+    'TEST_FILES_PATH',
+    __DIR__ . DIRECTORY_SEPARATOR . '_fixture' . DIRECTORY_SEPARATOR
+);