Testing against PHP 7

.gitattributes

@@ -1,6 +1,7 @@
-.gitattributes export-ignore  
+.coveralls.yml export-ignore
+.gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
 Makefile export-ignore
 phpunit.xml.dist export-ignore
-/tests export-ignore  
+tests/ export-ignore

.travis.yml

@@ -1,7 +1,9 @@
 language: php
 
 php:
+  - 5.5
   - 5.6
+  - 7
   - hhvm
 
 matrix:
@@ -10,8 +12,8 @@ matrix:
 
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer --prefer-source install
-  - composer require satooshi/php-coveralls
+  - travis_retry composer install --prefer-source
+  - composer require satooshi/php-coveralls --prefer-source
 
 script:
   - mkdir -p build/logs

README.md

@@ -1,6 +1,6 @@
 # bind-activerecord
 
-[![Release](https://img.shields.io/packagist/v/ICanBoogie/bind-activerecord.svg)](https://github.com/ICanBoogie/bind-activerecord/releases)
+[![Release](https://img.shields.io/packagist/v/ICanBoogie/bind-activerecord.svg)](https://packagist.org/packages/icanboogie/bind-activerecord)
 [![Build Status](https://img.shields.io/travis/ICanBoogie/bind-activerecord.svg)](http://travis-ci.org/ICanBoogie/bind-activerecord)
 [![HHVM](https://img.shields.io/hhvm/icanboogie/bind-activerecord.svg)](http://hhvm.h4cc.de/package/icanboogie/bind-activerecord)
 [![Code Quality](https://img.shields.io/scrutinizer/g/ICanBoogie/bind-activerecord.svg)](https://scrutinizer-ci.com/g/ICanBoogie/bind-activerecord)
@@ -119,7 +119,7 @@ return [
 
 ## Requirements
 
-The package requires PHP 5.6 or later.
+The package requires PHP 5.5 or later.
 
 
 
@@ -150,21 +150,16 @@ can be cloned with the following command line:
 
 ## Documentation
 
-The package is documented as part of the [ICanBoogie](http://icanboogie.org/) framework
-[documentation](http://icanboogie.org/docs/). You can generate the documentation for the package
-and its dependencies with the `make doc` command. The documentation is generated in the `docs`
-directory. [ApiGen](http://apigen.org/) is required. You can later clean the directory with
-the `make clean` command.
+The package is documented as part of the [ICanBoogie][] framework
+[documentation](http://icanboogie.org/docs/). You can generate the documentation for the package and its dependencies with the `make doc` command. The documentation is generated in the `build/docs` directory. [ApiGen](http://apigen.org/) is required. The directory can later be cleaned with the `make clean` command.
 
 
 
 
 
 ## Testing
 
-The test suite is ran with the `make test` command. [Composer](http://getcomposer.org/) is
-automatically installed as well as all dependencies required to run the suite. You can later
-clean the directory with the `make clean` command.
+The test suite is ran with the `make test` command. [PHPUnit](https://phpunit.de/) and [Composer](http://getcomposer.org/) need to be globally available to run the suite. The command installs dependencies as required. The `make test-coverage` command runs test suite and also creates an HTML coverage report in "build/coverage". The directory can later be cleaned with the `make clean` command.
 
 The package is continuously tested by [Travis CI](http://about.travis-ci.org/).
 

composer.json

@@ -18,7 +18,7 @@
 	},
 
 	"require": {
-		"php": ">=5.6.0",
+		"php": ">=5.5.0",
 		"icanboogie/icanboogie": ">=2.2.0",
 		"icanboogie/activerecord": ">=2.2.0"
 	},

lib/Hooks.php

@@ -45,7 +45,7 @@ static private function synthesize_config_from_namespace(array $fragments, $name
 			$config[] = $fragment[$namespace];
 		}
 
-		return $config ? array_merge(...$config) : [];
+		return $config ? call_user_func_array('array_merge', $config) : [];
 	}
 
 	/**

phpunit.xml.dist

@@ -17,9 +17,9 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./lib</directory>
-        </whitelist>
-    </filter>
+	<filter>
+		<whitelist processUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">./lib</directory>
+		</whitelist>
+	</filter>
 </phpunit>