From e6511dde9bcc7feee21ba1af372d0737f805ec30 Mon Sep 17 00:00:00 2001 From: webchick Date: Fri, 4 Sep 2015 18:45:29 -0700 Subject: [PATCH] Issue #2400407 by DuaelFr: Ensure vendor sebastian/exporter is on latest stable release --- core/composer.lock | 10 +- core/vendor/composer/installed.json | 136 +++++++++--------- .../sebastian/exporter/src/Exporter.php | 28 ++-- 3 files changed, 84 insertions(+), 90 deletions(-) diff --git a/core/composer.lock b/core/composer.lock index a92cf90ce90..06f0694b95e 100644 --- a/core/composer.lock +++ b/core/composer.lock @@ -1798,16 +1798,16 @@ }, { "name": "sebastian/exporter", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "84839970d05254c73cde183a721c7af13aede943" + "reference": "7ae5513327cb536431847bcc0c10edba2701064e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943", - "reference": "84839970d05254c73cde183a721c7af13aede943", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", + "reference": "7ae5513327cb536431847bcc0c10edba2701064e", "shasum": "" }, "require": { @@ -1860,7 +1860,7 @@ "export", "exporter" ], - "time": "2015-01-27 07:23:06" + "time": "2015-06-21 07:55:53" }, { "name": "sebastian/global-state", diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json index fc79e2a9bdb..c3f483ee8ce 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -476,74 +476,6 @@ "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context" }, - { - "name": "sebastian/exporter", - "version": "1.2.0", - "version_normalized": "1.2.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "84839970d05254c73cde183a721c7af13aede943" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943", - "reference": "84839970d05254c73cde183a721c7af13aede943", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~1.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "time": "2015-01-27 07:23:06", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", - "keywords": [ - "export", - "exporter" - ] - }, { "name": "sebastian/diff", "version": "1.3.0", @@ -3484,5 +3416,73 @@ "compare", "equality" ] + }, + { + "name": "sebastian/exporter", + "version": "1.2.1", + "version_normalized": "1.2.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "7ae5513327cb536431847bcc0c10edba2701064e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", + "reference": "7ae5513327cb536431847bcc0c10edba2701064e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "time": "2015-06-21 07:55:53", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ] } ] diff --git a/core/vendor/sebastian/exporter/src/Exporter.php b/core/vendor/sebastian/exporter/src/Exporter.php index 47208f3d58f..a9f5157c5a4 100644 --- a/core/vendor/sebastian/exporter/src/Exporter.php +++ b/core/vendor/sebastian/exporter/src/Exporter.php @@ -22,12 +22,6 @@ use SebastianBergmann\RecursionContext\Context; * $exporter = new Exporter; * print $exporter->export(new Exception); * - * - * @package Exporter - * @author Sebastian Bergmann - * @copyright Sebastian Bergmann - * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License - * @link https://github.com/sebastianbergmann/exporter */ class Exporter { @@ -44,8 +38,8 @@ class Exporter * - Carriage returns and newlines are normalized to \n * - Recursion and repeated rendering is treated properly * - * @param mixed $value - * @param integer $indentation The indentation level of the 2nd+ line + * @param mixed $value + * @param int $indentation The indentation level of the 2nd+ line * @return string */ public function export($value, $indentation = 0) @@ -60,8 +54,8 @@ class Exporter */ public function shortenedRecursiveExport(&$data, Context $context = null) { - $result = array(); - $exporter = new Exporter(); + $result = array(); + $exporter = new self(); if (!$context) { $context = new Context; @@ -88,7 +82,7 @@ class Exporter } } - return join(', ', $result); + return implode(', ', $result); } /** @@ -101,7 +95,7 @@ class Exporter * Newlines are replaced by the visible string '\n'. Contents of arrays * and objects (if any) are replaced by '...'. * - * @param mixed $value + * @param mixed $value * @return string * @see SebastianBergmann\Exporter\Exporter::export */ @@ -145,12 +139,12 @@ class Exporter public function toArray($value) { if (!is_object($value)) { - return (array)$value; + return (array) $value; } $array = array(); - foreach ((array)$value as $key => $val) { + foreach ((array) $value as $key => $val) { // properties are transformed to keys in the following way: // private $property => "\0Classname\0property" // protected $property => "\0*\0property" @@ -197,9 +191,9 @@ class Exporter /** * Recursive implementation of export * - * @param mixed $value The value to export - * @param integer $indentation The indentation level of the 2nd+ line - * @param \SebastianBergmann\RecursionContext\Context $processed Previously processed objects + * @param mixed $value The value to export + * @param int $indentation The indentation level of the 2nd+ line + * @param \SebastianBergmann\RecursionContext\Context $processed Previously processed objects * @return string * @see SebastianBergmann\Exporter\Exporter::export */