Using Parkour

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7.0
 

composer.json

@@ -19,10 +19,10 @@
 	"homepage": "http://github.com/essence/essence",
 	"minimum-stability": "dev",
 	"require": {
-		"php": ">=5.5.0",
 		"essence/dom": "dev-master",
 		"essence/http": "dev-master",
-		"fg/cascade": "1.0.0"
+		"php": ">=5.6.0",
+		"fg/parkour": "1.0.0"
 	},
 	"suggest": {
 		"ext-curl": "*"

lib/Essence/Di/Container.php

@@ -6,7 +6,7 @@
  */
 namespace Essence\Di;
 
-use Essence\Utility\Hash;
+use Parkour\Transform;
 use Closure;
 
 
@@ -73,7 +73,7 @@ public function set($property, $value) {
 	 *	@param array $properties Properties to merge.
 	 */
 	public function configure(array $properties) {
-		$this->_properties = Hash::merge(
+		$this->_properties = Transform::merge(
 			$this->_properties,
 			$properties
 		);

lib/Essence/Extractor.php

@@ -7,7 +7,7 @@
 namespace Essence;
 
 use Essence\Provider\Collection;
-use Essence\Utility\Hash;
+use Parkour\Transform;
 use Exception;
 
 
@@ -69,7 +69,7 @@ public function extract($url, array $options = []) {
 	 *	@return array An array of informations, indexed by URL.
 	 */
 	public function extractAll(array $urls, array $options = []) {
-		return Hash::combine($urls, function($url) use ($options) {
+		return Transform::combine($urls, function($url) use ($options) {
 			yield $url => $this->extract($url, $options);
 		});
 	}

lib/Essence/Provider.php

@@ -7,7 +7,8 @@
 namespace Essence;
 
 use Essence\Media;
-use Cascade\Cascade;
+use Parkour\Traverse;
+use Parkour\Functor\Execute;
 
 
 
@@ -19,18 +20,18 @@ abstract class Provider {
 	/**
 	 *	Preparators.
 	 *
-	 *	@var Cascade
+	 *	@var array
 	 */
-	protected $_Preparators = null;
+	protected $_preparators = [];
 
 
 
 	/**
 	 *	Presenters.
 	 *
-	 *	@var Cascade
+	 *	@var array
 	 */
-	protected $_Presenters = null;
+	protected $_presenters = [];
 
 
 
@@ -44,33 +45,23 @@ abstract class Provider {
 
 
 	/**
-	 *	Constructor.
-	 */
-	public function __construct() {
-		$this->_Preparators = new Cascade();
-		$this->_Presenters = new Cascade();
-	}
-
-
-
-	/**
-	 *
+	 *	Sets preparators.
 	 *
 	 *	@param array $preparators Preparators.
 	 */
 	public function setPreparators(array $preparators) {
-		$this->_Preparators->setFilters($preparators);
+		$this->_preparators = $preparators;
 	}
 
 
 
 	/**
-	 *
+	 *	Sets presenters.
 	 *
 	 *	@param array $presenters Presenters.
 	 */
 	public function setPresenters(array $presenters) {
-		$this->_Presenters->setFilters($presenters);
+		$this->_presenters = $presenters;
 	}
 
 
@@ -82,13 +73,26 @@ public function setPresenters(array $presenters) {
 	 *	@param array $options Custom options to be interpreted by the provider.
 	 *	@return Media Embed informations.
 	 */
-	public final function extract($url, array $options = []) {
-		$url = $this->_Preparators->filter($url);
+	final public function extract($url, array $options = []) {
+		$url = $this->filter($url, $this->_preparators);
 
 		$Media = $this->_extract($url, $options);
 		$Media->setDefault('url', $url);
 
-		return $this->_Presenters->filter($Media);
+		return $this->filter($Media, $this->_presenters);
+	}
+
+
+
+	/**
+	 *	Filters a value through a set of functions.
+	 *
+	 *	@param mixed $value Value.
+	 *	@param array $filters Filters.
+	 *	@return mixed Filtered value.
+	 */
+	private function filter($value, array $filters) {
+		return Traverse::reduce($filters, new Execute(), $value);
 	}
 
 

lib/Essence/Provider/MetaTags.php

@@ -11,7 +11,7 @@
 use Essence\Provider;
 use Essence\Dom\Document\Factory\Native as Dom;
 use Essence\Http\Client as Http;
-use Essence\Utility\Hash;
+use Parkour\Transform;
 use Exception;
 
 
@@ -55,8 +55,6 @@ class MetaTags extends Provider {
 	 *	@param Dom $Dom DOM parser.
 	 */
 	public function __construct(Http $Http, Dom $Dom) {
-		parent::__construct();
-
 		$this->_Http = $Http;
 		$this->_Dom = $Dom;
 	}
@@ -115,7 +113,7 @@ protected function _extractMetas($html) {
 	 *	@return Media Media.
 	 */
 	protected function _media(array $metas) {
-		$metas = Hash::combine($metas, function($Meta) {
+		$metas = Transform::combine($metas, function($Meta) {
 			yield $Meta->get('property') => $Meta->get('content');
 		});
 

lib/Essence/Provider/OEmbed.php

@@ -68,8 +68,6 @@ class OEmbed extends Provider {
 	 *	@param Dom $Dom DOM parser.
 	 */
 	public function __construct(Http $Http, Dom $Dom) {
-		parent::__construct();
-
 		$this->_Http = $Http;
 		$this->_Dom = $Dom;
 	}

lib/Essence/Provider/Presenter/Reindexer.php

@@ -8,7 +8,7 @@
 
 use Essence\Provider\Presenter;
 use Essence\Media;
-use Essence\Utility\Hash;
+use Parkour\Transform;
 
 
 
@@ -42,7 +42,7 @@ public function __construct(array $mapping) {
 	 */
 	public function present(Media $Media) {
 		return $Media->setProperties(
-			Hash::reindex(
+			Transform::reindex(
 				$Media->properties(),
 				$this->_mapping
 			)