Drop PHP 5.5 support #13

.travis.yml

@@ -8,7 +8,6 @@ cache:
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
@@ -19,12 +18,12 @@ matrix:
     - php: hhvm
 
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION != "5.5" ]]; then composer install --prefer-dist; fi
-  - if [[ $TRAVIS_PHP_VERSION = "5.5" ]]; then composer require satooshi/php-coveralls --prefer-dist; fi
+  - if [[ $TRAVIS_PHP_VERSION != "5.6" ]]; then composer install --prefer-dist; fi
+  - if [[ $TRAVIS_PHP_VERSION = "5.6" ]]; then composer require satooshi/php-coveralls --prefer-dist; fi
 
 script:
   - mkdir -p build/logs
   - phpunit --coverage-clover build/logs/clover.xml
 
 after_success:
-  - if [[ "$TRAVIS_PHP_VERSION" = "5.5" ]]; then php vendor/bin/coveralls -v; fi
+  - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then php vendor/bin/coveralls -v; fi

README.md

@@ -1,10 +1,10 @@
 # Active Record
 
 [![Release](https://img.shields.io/packagist/v/ICanBoogie/activerecord.svg)](https://packagist.org/packages/icanboogie/activerecord)
-[![Build Status](https://img.shields.io/travis/ICanBoogie/ActiveRecord.svg)](http://travis-ci.org/ICanBoogie/ActiveRecord)
+[![Build Status](https://img.shields.io/travis/ICanBoogie/ActiveRecord/4.0.svg)](http://travis-ci.org/ICanBoogie/ActiveRecord)
 [![HHVM](https://img.shields.io/hhvm/icanboogie/activerecord.svg)](http://hhvm.h4cc.de/package/icanboogie/activerecord)
-[![Code Quality](https://img.shields.io/scrutinizer/g/ICanBoogie/ActiveRecord.svg)](https://scrutinizer-ci.com/g/ICanBoogie/ActiveRecord)
-[![Code Coverage](https://img.shields.io/coveralls/ICanBoogie/ActiveRecord.svg)](https://coveralls.io/r/ICanBoogie/ActiveRecord)
+[![Code Quality](https://img.shields.io/scrutinizer/g/ICanBoogie/ActiveRecord/4.0.svg)](https://scrutinizer-ci.com/g/ICanBoogie/ActiveRecord)
+[![Code Coverage](https://img.shields.io/coveralls/ICanBoogie/ActiveRecord/4.0.svg)](https://coveralls.io/r/ICanBoogie/ActiveRecord)
 [![Packagist](https://img.shields.io/packagist/dt/icanboogie/activerecord.svg)](https://packagist.org/packages/icanboogie/activerecord)
 
 __Connections__, __models__ and __active records__ are the foundations of everything that concerns
@@ -2432,7 +2432,7 @@ $nodes = ActiveRecord\get_model('nodes');
 
 ## Requirements
 
-The package requires PHP 5.5 or later and the [PDO extension](http://php.net/manual/en/intro.pdo.php).
+The package requires PHP 5.6 or later and the [PDO extension](http://php.net/manual/en/intro.pdo.php).
 
 
 
@@ -2483,8 +2483,8 @@ clean` command.
 
 The package is continuously tested by [Travis CI](http://about.travis-ci.org/).
 
-[![Build Status](https://img.shields.io/travis/ICanBoogie/ActiveRecord.svg)](https://travis-ci.org/ICanBoogie/ActiveRecord)
-[![Code Coverage](https://img.shields.io/coveralls/ICanBoogie/ActiveRecord.svg)](https://coveralls.io/r/ICanBoogie/ActiveRecord)
+[![Build Status](https://img.shields.io/travis/ICanBoogie/ActiveRecord/4.0.svg)](https://travis-ci.org/ICanBoogie/ActiveRecord)
+[![Code Coverage](https://img.shields.io/coveralls/ICanBoogie/ActiveRecord/4.0.svg)](https://coveralls.io/r/ICanBoogie/ActiveRecord)
 
 
 
@@ -2498,27 +2498,27 @@ The package is continuously tested by [Travis CI](http://about.travis-ci.org/).
 
 
 
-[Connection]:                   http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.Connection.html
-[ConnectionAlreadyEstablished]: http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.ConnectionAlreadyEstablished.html
-[ConnectionNotDefined]:         http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.ConnectionNotDefined.html
-[ConnectionNotEstablished]:     http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.ConnectionNotEstablished.html
-[ConnectionCollection]:         http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.ConnectionCollection.html
-[CreatedAtProperty]:            http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.Property.CreatedAtProperty.html
-[DateTimeProperty]:             http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.Property.DateTimeProperty.html
-[Model]:                        http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.Model.html
-[ModelAlreadyInstantiated]:     http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.ModelAlreadyInstantiated.html
-[ModelNotDefined]:              http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.ModelNotDefined.html
-[ModelCollection]:              http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.ModelCollection.html
-[Query]:                        http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.Query.html
-[RecordNotFound]:               http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.RecordNotFound.html
-[RecordNotValid]:               http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.RecordNotValid.html
-[RelationNotDefined]:           http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.RelationNotDefined.html
-[RuntimeActiveRecordCache]:     http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.ActiveRecordCache.RuntimeActiveRecordCache.html
-[ScopeNotDefined]:              http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.ScopeNotDefined.html
-[StatementInvocationFailed]:    http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.StatementInvocationFailed.html
-[StatementNotValid]:            http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.StatementNotValid.html
-[UnableToSetFetchMode]:         http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.UnableToSetFetchMode.html
-[UpdatedAtProperty]:            http://api.icanboogie.org/activerecord/3.0/class-ICanBoogie.ActiveRecord.Property.UpdatedAtProperty.html
+[Connection]:                   http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.Connection.html
+[ConnectionAlreadyEstablished]: http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.ConnectionAlreadyEstablished.html
+[ConnectionNotDefined]:         http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.ConnectionNotDefined.html
+[ConnectionNotEstablished]:     http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.ConnectionNotEstablished.html
+[ConnectionCollection]:         http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.ConnectionCollection.html
+[CreatedAtProperty]:            http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.Property.CreatedAtProperty.html
+[DateTimeProperty]:             http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.Property.DateTimeProperty.html
+[Model]:                        http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.Model.html
+[ModelAlreadyInstantiated]:     http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.ModelAlreadyInstantiated.html
+[ModelNotDefined]:              http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.ModelNotDefined.html
+[ModelCollection]:              http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.ModelCollection.html
+[Query]:                        http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.Query.html
+[RecordNotFound]:               http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.RecordNotFound.html
+[RecordNotValid]:               http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.RecordNotValid.html
+[RelationNotDefined]:           http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.RelationNotDefined.html
+[RuntimeActiveRecordCache]:     http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.ActiveRecordCache.RuntimeActiveRecordCache.html
+[ScopeNotDefined]:              http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.ScopeNotDefined.html
+[StatementInvocationFailed]:    http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.StatementInvocationFailed.html
+[StatementNotValid]:            http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.StatementNotValid.html
+[UnableToSetFetchMode]:         http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.UnableToSetFetchMode.html
+[UpdatedAtProperty]:            http://api.icanboogie.org/activerecord/4.0/class-ICanBoogie.ActiveRecord.Property.UpdatedAtProperty.html
 [DateTime]:                     http://api.icanboogie.org/datetime/1.2/class-ICanBoogie.DateTime.html
 [ValidationErrors]:             http://api.icanboogie.org/validate/latest/class-ICanBoogie.Validate.ValidationErrors.html
 [icanboogie/bind-activerecord]: https://github.com/ICanBoogie/bind-activerecord

composer.json

@@ -21,9 +21,9 @@
 	"minimum-stability": "dev",
 
 	"require": {
-		"php": ">=5.5.0",
+		"php": ">=5.6.0",
 		"ext-pdo": "*",
-		"icanboogie/prototype": "^2.3",
+		"icanboogie/prototype": "^3.0",
 		"icanboogie/inflector": "^1.4",
 		"icanboogie/datetime": "^1.2",
 		"icanboogie/validate": "dev-master"

lib/ActiveRecord/ActiveRecordClassNotValid.php

@@ -13,6 +13,8 @@
 
 use ICanBoogie\Accessor\AccessorTrait;
 
+use function ICanBoogie\format;
+
 /**
  * Exception thrown when the ActiveRecord class is not valid.
  *
@@ -57,7 +59,7 @@ public function __construct($class, $message = null, $code = 500, \Exception $pr
 	 */
 	protected function format_message($class)
 	{
-		return \ICanBoogie\format("ActiveRecord class is not valid: %class", [
+		return format("ActiveRecord class is not valid: %class", [
 
 			'class' => $class
 

lib/ActiveRecord/BelongsToRelation.php

@@ -14,6 +14,8 @@
 use ICanBoogie\ActiveRecord;
 use ICanBoogie\Prototype;
 
+use function ICanBoogie\singularize;
+
 /**
  * Representation of the one-to-one relation.
  */
@@ -80,6 +82,6 @@ protected function alter_prototype(Prototype $prototype, $property)
 	 */
 	protected function resolve_property_name($related)
 	{
-		return \ICanBoogie\singularize(parent::resolve_property_name($related));
+		return singularize(parent::resolve_property_name($related));
 	}
 }

lib/ActiveRecord/Connection.php

@@ -186,11 +186,13 @@ public function __construct($dsn, $username = null, $password = null, $options =
 	/**
 	 * Alias to {@link query}.
 	 *
+	 * @param array $args
+	 *
 	 * @return Statement
 	 */
-	public function __invoke()
+	public function __invoke(...$args)
 	{
-		return call_user_func_array([ $this, 'query' ], func_get_args());
+		return $this->query(...$args);
 	}
 
 	/**
@@ -325,7 +327,7 @@ public function prepare($statement, $options = [])
 		{
 			$mode = (array) $options['mode'];
 
-			call_user_func_array([ $statement, 'setFetchMode' ], $mode);
+			$statement->setFetchMode(...$mode);
 		}
 
 		return $statement;

lib/ActiveRecord/ConnectionAlreadyEstablished.php

@@ -13,6 +13,8 @@
 
 use ICanBoogie\Accessor\AccessorTrait;
 
+use function ICanBoogie\format;
+
 /**
  * Exception thrown in attempt to set the definition of an already established connection.
  *
@@ -56,7 +58,7 @@ public function __construct($id, $code = 500, \Exception $previous = null)
 	 */
 	protected function format_message($id)
 	{
-		return \ICanBoogie\format("Connection already established: %id.", [
+		return format("Connection already established: %id.", [
 
 			'id' => $id
 

lib/ActiveRecord/ConnectionNotDefined.php

@@ -13,6 +13,8 @@
 
 use ICanBoogie\Accessor\AccessorTrait;
 
+use function ICanBoogie\format;
+
 /**
  * Exception thrown in attempt to obtain a connection that is not defined.
  *
@@ -53,7 +55,7 @@ public function __construct($id, $code = 500, \Exception $previous = null)
 	 */
 	protected function format_message($id)
 	{
-		return \ICanBoogie\format("Connection not defined: %id.", [
+		return format("Connection not defined: %id.", [
 
 			'id' => $id
 

lib/ActiveRecord/HasManyRelation.php

@@ -13,6 +13,8 @@
 
 use ICanBoogie\ActiveRecord;
 
+use function ICanBoogie\pluralize;
+
 /**
  * Representation of the one-to-many relation.
  */
@@ -34,6 +36,6 @@ public function __invoke(ActiveRecord $record)
 
 	protected function resolve_property_name($related)
 	{
-		return \ICanBoogie\pluralize(parent::resolve_property_name($related));
+		return pluralize(parent::resolve_property_name($related));
 	}
 }

lib/ActiveRecord/Helpers.php

@@ -34,7 +34,9 @@ class Helpers
 	 */
 	static public function __callStatic($name, array $arguments)
 	{
-		return call_user_func_array(self::$mapping[$name], $arguments);
+		$method = self::$mapping[$name];
+
+		return $method(...$arguments);
 	}
 
 	/**
@@ -44,6 +46,8 @@ static public function __callStatic($name, array $arguments)
 	 * @param callable $callback Callback.
 	 *
 	 * @throws \RuntimeException is attempt to patch an undefined function.
+	 *
+	 * @return callable
 	 */
 	static public function patch($name, $callback)
 	{

lib/ActiveRecord/Model.php

@@ -35,7 +35,7 @@
  * @method ActiveRecord one() one() The method is forwarded to {@link Query::one}.
  * @method ActiveRecord new() new(array $properties = []) Instantiate a new record.
  *
- * @method Model belongs_to() belongs_to($definition) Add a _belongs_to_ relation.
+ * @method Model belongs_to() belongs_to(...$args) Adds a _belongs_to_ relation.
  * @method Model has_many() has_many($related, $options = []) Adds a _has_many_ relation.
  *
  * @property-read Model|null $parent Parent model.
@@ -163,6 +163,21 @@ public function __construct(ModelCollection $models, array $attributes)
 		$this->resolve_relations();
 	}
 
+	// @codeCoverageIgnoreStart
+	public function __debugInfo()
+	{
+		return [
+
+			'id' => $this->id,
+			'name' => "$this->name ($this->unprefixed_name)",
+			'parent' => $this->parent ? $this->parent->id . " of " . get_class($this->parent) : null,
+			'parent_model' => $this->parent_model ? $this->parent_model->id . " of " . get_class($this->parent_model) : null,
+			'relations' => $this->relations
+
+		];
+	}
+	// @codeCoverageIgnoreEnd
+
 	/**
 	 * Resolves constructor attributes.
 	 *
@@ -259,7 +274,7 @@ public function __call($method, $arguments)
 	{
 		if ($method == 'new')
 		{
-			return call_user_func_array([ $this, 'new_record' ], $arguments);
+			return $this->new_record(...$arguments);
 		}
 
 		if (is_callable([ Query::class, $method ])
@@ -268,12 +283,12 @@ public function __call($method, $arguments)
 		{
 			$query = new Query($this);
 
-			return call_user_func_array([ $query, $method ], $arguments);
+			return $query->$method(...$arguments);
 		}
 
 		if (is_callable([ RelationCollection::class, $method ]))
 		{
-			return call_user_func_array([ $this->relations, $method ], $arguments);
+			return $this->relations->$method(...$arguments);
 		}
 
 		return parent::__call($method, $arguments);
@@ -542,7 +557,7 @@ public function scope($scope_name, array $scope_args = [])
 	{
 		try
 		{
-			return call_user_func_array([ $this, 'scope_' . $scope_name ], $scope_args);
+			return $this->{ 'scope_' . $scope_name}(...$scope_args);
 		}
 		catch (MethodNotDefined $e)
 		{