Зуев Егор / wiki.dev

Go to a project
Toggle navigation
Toggle navigation pinning
Younès EL BIACHE
9537e2ae 1 parent 10418323

html diff in revision view

Inline Side-by-side
Showing 6 changed files with 587 additions and 295 deletions
...@@ -12,6 +12,7 @@ use BookStack\Repos\ChapterRepo; ...@@ -12,6 +12,7 @@ use BookStack\Repos\ChapterRepo;
12 use BookStack\Repos\PageRepo; 12 use BookStack\Repos\PageRepo;
13 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; 13 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
14 use Views; 14 use Views;
15 +use Icap\HtmlDiff\HtmlDiff;
15 16
16 class PageController extends Controller 17 class PageController extends Controller
17 { 18 {
...@@ -332,9 +333,19 @@ class PageController extends Controller ...@@ -332,9 +333,19 @@ class PageController extends Controller
332 $book = $this->bookRepo->getBySlug($bookSlug); 333 $book = $this->bookRepo->getBySlug($bookSlug);
333 $page = $this->pageRepo->getBySlug($pageSlug, $book->id); 334 $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
334 $revision = $this->pageRepo->getRevisionById($revisionId); 335 $revision = $this->pageRepo->getRevisionById($revisionId);
336 +
337 + $next = $revision->getNext() ?: $page;
338 + $htmlDiff = new HtmlDiff($revision->html, $next->html, true);
339 + $diff = $htmlDiff->outputDiff()->toString();
340 +
335 $page->fill($revision->toArray()); 341 $page->fill($revision->toArray());
336 $this->setPageTitle('Page Revision For ' . $page->getShortName()); 342 $this->setPageTitle('Page Revision For ' . $page->getShortName());
337 - return view('pages/revision', ['page' => $page, 'book' => $book]); 343 +
344 + return view('pages/revision', [
345 + 'page' => $page,
346 + 'book' => $book,
347 + 'diff' => $diff,
348 + ]);
338 } 349 }
339 350
340 /** 351 /**
......
...@@ -32,4 +32,25 @@ class PageRevision extends Model ...@@ -32,4 +32,25 @@ class PageRevision extends Model
32 return $this->page->getUrl() . '/revisions/' . $this->id; 32 return $this->page->getUrl() . '/revisions/' . $this->id;
33 } 33 }
34 34
35 + /**
36 + * Get previous revision
37 + * @return \BookStack\PageRevision
38 + */
39 + public function getPrevious()
40 + {
41 + if ($id = PageRevision::where('id', '<', $this->id)->max('id')) {
42 + return PageRevision::find($id);
43 + }
44 + }
45 +
46 + /**
47 + * Get next revision
48 + * @return \BookStack\PageRevision
49 + */
50 + public function getNext()
51 + {
52 + if ($id = PageRevision::where('id', '>', $this->id)->min('id')) {
53 + return PageRevision::find($id);
54 + }
55 + }
35 } 56 }
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 "barryvdh/laravel-debugbar": "^2.0", 13 "barryvdh/laravel-debugbar": "^2.0",
14 "league/flysystem-aws-s3-v3": "^1.0", 14 "league/flysystem-aws-s3-v3": "^1.0",
15 "barryvdh/laravel-dompdf": "0.6.*", 15 "barryvdh/laravel-dompdf": "0.6.*",
16 - "predis/predis": "^1.0" 16 + "predis/predis": "^1.0",
17 + "icap/html-diff": "^1.1"
17 }, 18 },
18 "require-dev": { 19 "require-dev": {
19 "fzaninotto/faker": "~1.4", 20 "fzaninotto/faker": "~1.4",
......
...@@ -4,27 +4,27 @@ ...@@ -4,27 +4,27 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 - "hash": "eb7c71e9ed116d3fd2a1d0af07f9f134", 7 + "hash": "3d8e2dfddefb412055d28ffc922969fd",
8 - "content-hash": "17d2d7fc5fed682f2a290d6588538035", 8 + "content-hash": "7658fea0b4df71cf7b97bcdf8a29b9eb",
9 "packages": [ 9 "packages": [
10 { 10 {
11 "name": "aws/aws-sdk-php", 11 "name": "aws/aws-sdk-php",
12 - "version": "3.17.5", 12 + "version": "3.18.25",
13 "source": { 13 "source": {
14 "type": "git", 14 "type": "git",
15 "url": "https://github.com/aws/aws-sdk-php.git", 15 "url": "https://github.com/aws/aws-sdk-php.git",
16 - "reference": "1cef9b334729b3564c9aef15481a55561c54b53f" 16 + "reference": "37a8ce927a69de3d821c21b64674a2b3b9d1d247"
17 }, 17 },
18 "dist": { 18 "dist": {
19 "type": "zip", 19 "type": "zip",
20 - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1cef9b334729b3564c9aef15481a55561c54b53f", 20 + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/37a8ce927a69de3d821c21b64674a2b3b9d1d247",
21 - "reference": "1cef9b334729b3564c9aef15481a55561c54b53f", 21 + "reference": "37a8ce927a69de3d821c21b64674a2b3b9d1d247",
22 "shasum": "" 22 "shasum": ""
23 }, 23 },
24 "require": { 24 "require": {
25 "guzzlehttp/guzzle": "~5.3|~6.0.1|~6.1", 25 "guzzlehttp/guzzle": "~5.3|~6.0.1|~6.1",
26 "guzzlehttp/promises": "~1.0", 26 "guzzlehttp/promises": "~1.0",
27 - "guzzlehttp/psr7": "~1.0", 27 + "guzzlehttp/psr7": "~1.3.1",
28 "mtdowling/jmespath.php": "~2.2", 28 "mtdowling/jmespath.php": "~2.2",
29 "php": ">=5.5" 29 "php": ">=5.5"
30 }, 30 },
...@@ -85,20 +85,20 @@ ...@@ -85,20 +85,20 @@
85 "s3", 85 "s3",
86 "sdk" 86 "sdk"
87 ], 87 ],
88 - "time": "2016-04-07 22:44:13" 88 + "time": "2016-07-05 19:25:06"
89 }, 89 },
90 { 90 {
91 "name": "barryvdh/laravel-debugbar", 91 "name": "barryvdh/laravel-debugbar",
92 - "version": "v2.2.0", 92 + "version": "v2.2.2",
93 "source": { 93 "source": {
94 "type": "git", 94 "type": "git",
95 "url": "https://github.com/barryvdh/laravel-debugbar.git", 95 "url": "https://github.com/barryvdh/laravel-debugbar.git",
96 - "reference": "13b7058d2120c8d5af7f1ada21b7c44dd87b666a" 96 + "reference": "c291e58d0a13953e0f68d99182ee77ebc693edc0"
97 }, 97 },
98 "dist": { 98 "dist": {
99 "type": "zip", 99 "type": "zip",
100 - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/13b7058d2120c8d5af7f1ada21b7c44dd87b666a", 100 + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/c291e58d0a13953e0f68d99182ee77ebc693edc0",
101 - "reference": "13b7058d2120c8d5af7f1ada21b7c44dd87b666a", 101 + "reference": "c291e58d0a13953e0f68d99182ee77ebc693edc0",
102 "shasum": "" 102 "shasum": ""
103 }, 103 },
104 "require": { 104 "require": {
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
139 "profiler", 139 "profiler",
140 "webprofiler" 140 "webprofiler"
141 ], 141 ],
142 - "time": "2016-02-17 08:32:21" 142 + "time": "2016-05-11 13:54:43"
143 }, 143 },
144 { 144 {
145 "name": "barryvdh/laravel-dompdf", 145 "name": "barryvdh/laravel-dompdf",
...@@ -191,28 +191,31 @@ ...@@ -191,28 +191,31 @@
191 }, 191 },
192 { 192 {
193 "name": "barryvdh/laravel-ide-helper", 193 "name": "barryvdh/laravel-ide-helper",
194 - "version": "v2.1.4", 194 + "version": "v2.2.1",
195 "source": { 195 "source": {
196 "type": "git", 196 "type": "git",
197 "url": "https://github.com/barryvdh/laravel-ide-helper.git", 197 "url": "https://github.com/barryvdh/laravel-ide-helper.git",
198 - "reference": "f1ebd847aac9a4545325d35108cafc285fe1605f" 198 + "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463"
199 }, 199 },
200 "dist": { 200 "dist": {
201 "type": "zip", 201 "type": "zip",
202 - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/f1ebd847aac9a4545325d35108cafc285fe1605f", 202 + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/28af7cd19ca41cc0c63dd1de2b46c2b84d31c463",
203 - "reference": "f1ebd847aac9a4545325d35108cafc285fe1605f", 203 + "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463",
204 "shasum": "" 204 "shasum": ""
205 }, 205 },
206 "require": { 206 "require": {
207 - "illuminate/console": "5.0.x|5.1.x|5.2.x", 207 + "barryvdh/reflection-docblock": "^2.0.4",
208 - "illuminate/filesystem": "5.0.x|5.1.x|5.2.x", 208 + "illuminate/console": "^5.0,<5.4",
209 - "illuminate/support": "5.0.x|5.1.x|5.2.x", 209 + "illuminate/filesystem": "^5.0,<5.4",
210 + "illuminate/support": "^5.0,<5.4",
210 "php": ">=5.4.0", 211 "php": ">=5.4.0",
211 - "phpdocumentor/reflection-docblock": "^2.0.4", 212 + "symfony/class-loader": "^2.3|^3.0"
212 - "symfony/class-loader": "~2.3|~3.0"
213 }, 213 },
214 "require-dev": { 214 "require-dev": {
215 - "doctrine/dbal": "~2.3" 215 + "doctrine/dbal": "~2.3",
216 + "phpunit/phpunit": "4.*",
217 + "scrutinizer/ocular": "~1.1",
218 + "squizlabs/php_codesniffer": "~2.3"
216 }, 219 },
217 "suggest": { 220 "suggest": {
218 "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)" 221 "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)"
...@@ -220,7 +223,7 @@ ...@@ -220,7 +223,7 @@
220 "type": "library", 223 "type": "library",
221 "extra": { 224 "extra": {
222 "branch-alias": { 225 "branch-alias": {
223 - "dev-master": "2.1-dev" 226 + "dev-master": "2.2-dev"
224 } 227 }
225 }, 228 },
226 "autoload": { 229 "autoload": {
...@@ -250,7 +253,56 @@ ...@@ -250,7 +253,56 @@
250 "phpstorm", 253 "phpstorm",
251 "sublime" 254 "sublime"
252 ], 255 ],
253 - "time": "2016-03-03 08:45:00" 256 + "time": "2016-07-04 11:52:48"
257 + },
258 + {
259 + "name": "barryvdh/reflection-docblock",
260 + "version": "v2.0.4",
261 + "source": {
262 + "type": "git",
263 + "url": "https://github.com/barryvdh/ReflectionDocBlock.git",
264 + "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c"
265 + },
266 + "dist": {
267 + "type": "zip",
268 + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/3dcbd98b5d9384a5357266efba8fd29884458e5c",
269 + "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c",
270 + "shasum": ""
271 + },
272 + "require": {
273 + "php": ">=5.3.3"
274 + },
275 + "require-dev": {
276 + "phpunit/phpunit": "~4.0,<4.5"
277 + },
278 + "suggest": {
279 + "dflydev/markdown": "~1.0",
280 + "erusev/parsedown": "~1.0"
281 + },
282 + "type": "library",
283 + "extra": {
284 + "branch-alias": {
285 + "dev-master": "2.0.x-dev"
286 + }
287 + },
288 + "autoload": {
289 + "psr-0": {
290 + "Barryvdh": [
291 + "src/"
292 + ]
293 + }
294 + },
295 + "notification-url": "https://packagist.org/downloads/",
296 + "license": [
297 + "MIT"
298 + ],
299 + "authors": [
300 + {
301 + "name": "Mike van Riel",
302 + "email": "mike.vanriel@naenius.com"
303 + }
304 + ],
305 + "time": "2016-06-13 19:28:20"
254 }, 306 },
255 { 307 {
256 "name": "classpreloader/classpreloader", 308 "name": "classpreloader/classpreloader",
...@@ -537,6 +589,7 @@ ...@@ -537,6 +589,7 @@
537 "rest", 589 "rest",
538 "web service" 590 "web service"
539 ], 591 ],
592 + "abandoned": "guzzlehttp/guzzle",
540 "time": "2014-01-28 22:29:15" 593 "time": "2014-01-28 22:29:15"
541 }, 594 },
542 { 595 {
...@@ -603,16 +656,16 @@ ...@@ -603,16 +656,16 @@
603 }, 656 },
604 { 657 {
605 "name": "guzzlehttp/promises", 658 "name": "guzzlehttp/promises",
606 - "version": "1.1.0", 659 + "version": "1.2.0",
607 "source": { 660 "source": {
608 "type": "git", 661 "type": "git",
609 "url": "https://github.com/guzzle/promises.git", 662 "url": "https://github.com/guzzle/promises.git",
610 - "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8" 663 + "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579"
611 }, 664 },
612 "dist": { 665 "dist": {
613 "type": "zip", 666 "type": "zip",
614 - "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8", 667 + "url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579",
615 - "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8", 668 + "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579",
616 "shasum": "" 669 "shasum": ""
617 }, 670 },
618 "require": { 671 "require": {
...@@ -650,20 +703,20 @@ ...@@ -650,20 +703,20 @@
650 "keywords": [ 703 "keywords": [
651 "promise" 704 "promise"
652 ], 705 ],
653 - "time": "2016-03-08 01:15:46" 706 + "time": "2016-05-18 16:56:05"
654 }, 707 },
655 { 708 {
656 "name": "guzzlehttp/psr7", 709 "name": "guzzlehttp/psr7",
657 - "version": "1.2.3", 710 + "version": "1.3.1",
658 "source": { 711 "source": {
659 "type": "git", 712 "type": "git",
660 "url": "https://github.com/guzzle/psr7.git", 713 "url": "https://github.com/guzzle/psr7.git",
661 - "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b" 714 + "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
662 }, 715 },
663 "dist": { 716 "dist": {
664 "type": "zip", 717 "type": "zip",
665 - "url": "https://api.github.com/repos/guzzle/psr7/zipball/2e89629ff057ebb49492ba08e6995d3a6a80021b", 718 + "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
666 - "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b", 719 + "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
667 "shasum": "" 720 "shasum": ""
668 }, 721 },
669 "require": { 722 "require": {
...@@ -679,7 +732,7 @@ ...@@ -679,7 +732,7 @@
679 "type": "library", 732 "type": "library",
680 "extra": { 733 "extra": {
681 "branch-alias": { 734 "branch-alias": {
682 - "dev-master": "1.0-dev" 735 + "dev-master": "1.4-dev"
683 } 736 }
684 }, 737 },
685 "autoload": { 738 "autoload": {
...@@ -708,20 +761,64 @@ ...@@ -708,20 +761,64 @@
708 "stream", 761 "stream",
709 "uri" 762 "uri"
710 ], 763 ],
711 - "time": "2016-02-18 21:54:00" 764 + "time": "2016-06-24 23:00:38"
765 + },
766 + {
767 + "name": "icap/html-diff",
768 + "version": "v1.1.0",
769 + "source": {
770 + "type": "git",
771 + "url": "https://github.com/iCAPLyon1/HtmlDiff.git",
772 + "reference": "f58ddb196292ae585a2efb7692653d015ecc436f"
773 + },
774 + "dist": {
775 + "type": "zip",
776 + "url": "https://api.github.com/repos/iCAPLyon1/HtmlDiff/zipball/f58ddb196292ae585a2efb7692653d015ecc436f",
777 + "reference": "f58ddb196292ae585a2efb7692653d015ecc436f",
778 + "shasum": ""
779 + },
780 + "require": {
781 + "php": ">=5.3.0"
782 + },
783 + "require-dev": {
784 + "php": ">=5.3.0"
785 + },
786 + "type": "library",
787 + "autoload": {
788 + "psr-4": {
789 + "Icap\\HtmlDiff\\": "src/Icap/HtmlDiff"
790 + }
791 + },
792 + "notification-url": "https://packagist.org/downloads/",
793 + "authors": [
794 + {
795 + "name": "Panagiotis Tsavdaris",
796 + "email": "ptsavdar@gmail.com"
797 + },
798 + {
799 + "name": "ICAP development team",
800 + "homepage": "https://github.com/iCAPLyon1"
801 + }
802 + ],
803 + "description": "A PHP5 library that diffs (compares) HTML files.",
804 + "keywords": [
805 + "daisy diff",
806 + "html diff"
807 + ],
808 + "time": "2016-02-17 16:35:09"
712 }, 809 },
713 { 810 {
714 "name": "intervention/image", 811 "name": "intervention/image",
715 - "version": "2.3.6", 812 + "version": "2.3.7",
716 "source": { 813 "source": {
717 "type": "git", 814 "type": "git",
718 "url": "https://github.com/Intervention/image.git", 815 "url": "https://github.com/Intervention/image.git",
719 - "reference": "e368d262887dbb2fdfaf710880571ede51e9c0e6" 816 + "reference": "22088b04728a039bd1fc32f7e79a89a118b78698"
720 }, 817 },
721 "dist": { 818 "dist": {
722 "type": "zip", 819 "type": "zip",
723 - "url": "https://api.github.com/repos/Intervention/image/zipball/e368d262887dbb2fdfaf710880571ede51e9c0e6", 820 + "url": "https://api.github.com/repos/Intervention/image/zipball/22088b04728a039bd1fc32f7e79a89a118b78698",
724 - "reference": "e368d262887dbb2fdfaf710880571ede51e9c0e6", 821 + "reference": "22088b04728a039bd1fc32f7e79a89a118b78698",
725 "shasum": "" 822 "shasum": ""
726 }, 823 },
727 "require": { 824 "require": {
...@@ -770,7 +867,7 @@ ...@@ -770,7 +867,7 @@
770 "thumbnail", 867 "thumbnail",
771 "watermark" 868 "watermark"
772 ], 869 ],
773 - "time": "2016-02-26 18:18:19" 870 + "time": "2016-04-26 14:08:40"
774 }, 871 },
775 { 872 {
776 "name": "jakub-onderka/php-console-color", 873 "name": "jakub-onderka/php-console-color",
...@@ -919,16 +1016,16 @@ ...@@ -919,16 +1016,16 @@
919 }, 1016 },
920 { 1017 {
921 "name": "laravel/framework", 1018 "name": "laravel/framework",
922 - "version": "v5.2.29", 1019 + "version": "v5.2.39",
923 "source": { 1020 "source": {
924 "type": "git", 1021 "type": "git",
925 "url": "https://github.com/laravel/framework.git", 1022 "url": "https://github.com/laravel/framework.git",
926 - "reference": "e3d644eb131f18c5f3d28ff7bc678bc797091f20" 1023 + "reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a"
927 }, 1024 },
928 "dist": { 1025 "dist": {
929 "type": "zip", 1026 "type": "zip",
930 - "url": "https://api.github.com/repos/laravel/framework/zipball/e3d644eb131f18c5f3d28ff7bc678bc797091f20", 1027 + "url": "https://api.github.com/repos/laravel/framework/zipball/c2a77050269b4e03bd9a735a9f24e573a7598b8a",
931 - "reference": "e3d644eb131f18c5f3d28ff7bc678bc797091f20", 1028 + "reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a",
932 "shasum": "" 1029 "shasum": ""
933 }, 1030 },
934 "require": { 1031 "require": {
...@@ -989,7 +1086,7 @@ ...@@ -989,7 +1086,7 @@
989 }, 1086 },
990 "require-dev": { 1087 "require-dev": {
991 "aws/aws-sdk-php": "~3.0", 1088 "aws/aws-sdk-php": "~3.0",
992 - "mockery/mockery": "~0.9.2", 1089 + "mockery/mockery": "~0.9.4",
993 "pda/pheanstalk": "~3.0", 1090 "pda/pheanstalk": "~3.0",
994 "phpunit/phpunit": "~4.1", 1091 "phpunit/phpunit": "~4.1",
995 "predis/predis": "~1.0", 1092 "predis/predis": "~1.0",
...@@ -1007,7 +1104,8 @@ ...@@ -1007,7 +1104,8 @@
1007 "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", 1104 "predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
1008 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", 1105 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).",
1009 "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).", 1106 "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).",
1010 - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*)." 1107 + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*).",
1108 + "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)."
1011 }, 1109 },
1012 "type": "library", 1110 "type": "library",
1013 "extra": { 1111 "extra": {
...@@ -1043,20 +1141,20 @@ ...@@ -1043,20 +1141,20 @@
1043 "framework", 1141 "framework",
1044 "laravel" 1142 "laravel"
1045 ], 1143 ],
1046 - "time": "2016-04-03 01:43:55" 1144 + "time": "2016-06-17 19:25:12"
1047 }, 1145 },
1048 { 1146 {
1049 "name": "laravel/socialite", 1147 "name": "laravel/socialite",
1050 - "version": "v2.0.15", 1148 + "version": "v2.0.18",
1051 "source": { 1149 "source": {
1052 "type": "git", 1150 "type": "git",
1053 "url": "https://github.com/laravel/socialite.git", 1151 "url": "https://github.com/laravel/socialite.git",
1054 - "reference": "edd00ab96933e3ef053533cce81e958fb26921af" 1152 + "reference": "76ee5397fcdea5a062361392abca4eb397e519a3"
1055 }, 1153 },
1056 "dist": { 1154 "dist": {
1057 "type": "zip", 1155 "type": "zip",
1058 - "url": "https://api.github.com/repos/laravel/socialite/zipball/edd00ab96933e3ef053533cce81e958fb26921af", 1156 + "url": "https://api.github.com/repos/laravel/socialite/zipball/76ee5397fcdea5a062361392abca4eb397e519a3",
1059 - "reference": "edd00ab96933e3ef053533cce81e958fb26921af", 1157 + "reference": "76ee5397fcdea5a062361392abca4eb397e519a3",
1060 "shasum": "" 1158 "shasum": ""
1061 }, 1159 },
1062 "require": { 1160 "require": {
...@@ -1069,7 +1167,7 @@ ...@@ -1069,7 +1167,7 @@
1069 }, 1167 },
1070 "require-dev": { 1168 "require-dev": {
1071 "mockery/mockery": "~0.9", 1169 "mockery/mockery": "~0.9",
1072 - "phpunit/phpunit": "~4.0" 1170 + "phpunit/phpunit": "~4.0|~5.0"
1073 }, 1171 },
1074 "type": "library", 1172 "type": "library",
1075 "extra": { 1173 "extra": {
...@@ -1097,20 +1195,20 @@ ...@@ -1097,20 +1195,20 @@
1097 "laravel", 1195 "laravel",
1098 "oauth" 1196 "oauth"
1099 ], 1197 ],
1100 - "time": "2016-03-21 14:30:30" 1198 + "time": "2016-06-22 12:40:16"
1101 }, 1199 },
1102 { 1200 {
1103 "name": "league/flysystem", 1201 "name": "league/flysystem",
1104 - "version": "1.0.20", 1202 + "version": "1.0.24",
1105 "source": { 1203 "source": {
1106 "type": "git", 1204 "type": "git",
1107 "url": "https://github.com/thephpleague/flysystem.git", 1205 "url": "https://github.com/thephpleague/flysystem.git",
1108 - "reference": "e87a786e3ae12a25cf78a71bb07b4b384bfaa83a" 1206 + "reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b"
1109 }, 1207 },
1110 "dist": { 1208 "dist": {
1111 "type": "zip", 1209 "type": "zip",
1112 - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e87a786e3ae12a25cf78a71bb07b4b384bfaa83a", 1210 + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9aca859a303fdca30370f42b8c611d9cf0dedf4b",
1113 - "reference": "e87a786e3ae12a25cf78a71bb07b4b384bfaa83a", 1211 + "reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b",
1114 "shasum": "" 1212 "shasum": ""
1115 }, 1213 },
1116 "require": { 1214 "require": {
...@@ -1180,20 +1278,20 @@ ...@@ -1180,20 +1278,20 @@
1180 "sftp", 1278 "sftp",
1181 "storage" 1279 "storage"
1182 ], 1280 ],
1183 - "time": "2016-03-14 21:54:11" 1281 + "time": "2016-06-03 19:11:39"
1184 }, 1282 },
1185 { 1283 {
1186 "name": "league/flysystem-aws-s3-v3", 1284 "name": "league/flysystem-aws-s3-v3",
1187 - "version": "1.0.9", 1285 + "version": "1.0.13",
1188 "source": { 1286 "source": {
1189 "type": "git", 1287 "type": "git",
1190 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", 1288 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
1191 - "reference": "595e24678bf78f8107ebc9355d8376ae0eb712c6" 1289 + "reference": "dc56a8faf3aff0841f9eae04b6af94a50657896c"
1192 }, 1290 },
1193 "dist": { 1291 "dist": {
1194 "type": "zip", 1292 "type": "zip",
1195 - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/595e24678bf78f8107ebc9355d8376ae0eb712c6", 1293 + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/dc56a8faf3aff0841f9eae04b6af94a50657896c",
1196 - "reference": "595e24678bf78f8107ebc9355d8376ae0eb712c6", 1294 + "reference": "dc56a8faf3aff0841f9eae04b6af94a50657896c",
1197 "shasum": "" 1295 "shasum": ""
1198 }, 1296 },
1199 "require": { 1297 "require": {
...@@ -1227,7 +1325,7 @@ ...@@ -1227,7 +1325,7 @@
1227 } 1325 }
1228 ], 1326 ],
1229 "description": "Flysystem adapter for the AWS S3 SDK v3.x", 1327 "description": "Flysystem adapter for the AWS S3 SDK v3.x",
1230 - "time": "2015-11-19 08:44:16" 1328 + "time": "2016-06-21 21:34:35"
1231 }, 1329 },
1232 { 1330 {
1233 "name": "league/oauth1-client", 1331 "name": "league/oauth1-client",
...@@ -1355,16 +1453,16 @@ ...@@ -1355,16 +1453,16 @@
1355 }, 1453 },
1356 { 1454 {
1357 "name": "monolog/monolog", 1455 "name": "monolog/monolog",
1358 - "version": "1.18.2", 1456 + "version": "1.20.0",
1359 "source": { 1457 "source": {
1360 "type": "git", 1458 "type": "git",
1361 "url": "https://github.com/Seldaek/monolog.git", 1459 "url": "https://github.com/Seldaek/monolog.git",
1362 - "reference": "064b38c16790249488e7a8b987acf1c9d7383c09" 1460 + "reference": "55841909e2bcde01b5318c35f2b74f8ecc86e037"
1363 }, 1461 },
1364 "dist": { 1462 "dist": {
1365 "type": "zip", 1463 "type": "zip",
1366 - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/064b38c16790249488e7a8b987acf1c9d7383c09", 1464 + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/55841909e2bcde01b5318c35f2b74f8ecc86e037",
1367 - "reference": "064b38c16790249488e7a8b987acf1c9d7383c09", 1465 + "reference": "55841909e2bcde01b5318c35f2b74f8ecc86e037",
1368 "shasum": "" 1466 "shasum": ""
1369 }, 1467 },
1370 "require": { 1468 "require": {
...@@ -1383,8 +1481,8 @@ ...@@ -1383,8 +1481,8 @@
1383 "php-console/php-console": "^3.1.3", 1481 "php-console/php-console": "^3.1.3",
1384 "phpunit/phpunit": "~4.5", 1482 "phpunit/phpunit": "~4.5",
1385 "phpunit/phpunit-mock-objects": "2.3.0", 1483 "phpunit/phpunit-mock-objects": "2.3.0",
1386 - "raven/raven": "^0.13",
1387 "ruflin/elastica": ">=0.90 <3.0", 1484 "ruflin/elastica": ">=0.90 <3.0",
1485 + "sentry/sentry": "^0.13",
1388 "swiftmailer/swiftmailer": "~5.3" 1486 "swiftmailer/swiftmailer": "~5.3"
1389 }, 1487 },
1390 "suggest": { 1488 "suggest": {
...@@ -1396,9 +1494,9 @@ ...@@ -1396,9 +1494,9 @@
1396 "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", 1494 "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
1397 "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", 1495 "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
1398 "php-console/php-console": "Allow sending log messages to Google Chrome", 1496 "php-console/php-console": "Allow sending log messages to Google Chrome",
1399 - "raven/raven": "Allow sending log messages to a Sentry server",
1400 "rollbar/rollbar": "Allow sending log messages to Rollbar", 1497 "rollbar/rollbar": "Allow sending log messages to Rollbar",
1401 - "ruflin/elastica": "Allow sending log messages to an Elastic Search server" 1498 + "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
1499 + "sentry/sentry": "Allow sending log messages to a Sentry server"
1402 }, 1500 },
1403 "type": "library", 1501 "type": "library",
1404 "extra": { 1502 "extra": {
...@@ -1429,7 +1527,7 @@ ...@@ -1429,7 +1527,7 @@
1429 "logging", 1527 "logging",
1430 "psr-3" 1528 "psr-3"
1431 ], 1529 ],
1432 - "time": "2016-04-02 13:12:58" 1530 + "time": "2016-07-02 14:02:10"
1433 }, 1531 },
1434 { 1532 {
1435 "name": "mtdowling/cron-expression", 1533 "name": "mtdowling/cron-expression",
...@@ -1579,16 +1677,16 @@ ...@@ -1579,16 +1677,16 @@
1579 }, 1677 },
1580 { 1678 {
1581 "name": "nikic/php-parser", 1679 "name": "nikic/php-parser",
1582 - "version": "v2.0.1", 1680 + "version": "v2.1.0",
1583 "source": { 1681 "source": {
1584 "type": "git", 1682 "type": "git",
1585 "url": "https://github.com/nikic/PHP-Parser.git", 1683 "url": "https://github.com/nikic/PHP-Parser.git",
1586 - "reference": "ce5be709d59b32dd8a88c80259028759991a4206" 1684 + "reference": "47b254ea51f1d6d5dc04b9b299e88346bf2369e3"
1587 }, 1685 },
1588 "dist": { 1686 "dist": {
1589 "type": "zip", 1687 "type": "zip",
1590 - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ce5be709d59b32dd8a88c80259028759991a4206", 1688 + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/47b254ea51f1d6d5dc04b9b299e88346bf2369e3",
1591 - "reference": "ce5be709d59b32dd8a88c80259028759991a4206", 1689 + "reference": "47b254ea51f1d6d5dc04b9b299e88346bf2369e3",
1592 "shasum": "" 1690 "shasum": ""
1593 }, 1691 },
1594 "require": { 1692 "require": {
...@@ -1604,7 +1702,7 @@ ...@@ -1604,7 +1702,7 @@
1604 "type": "library", 1702 "type": "library",
1605 "extra": { 1703 "extra": {
1606 "branch-alias": { 1704 "branch-alias": {
1607 - "dev-master": "2.0-dev" 1705 + "dev-master": "2.1-dev"
1608 } 1706 }
1609 }, 1707 },
1610 "autoload": { 1708 "autoload": {
...@@ -1626,7 +1724,7 @@ ...@@ -1626,7 +1724,7 @@
1626 "parser", 1724 "parser",
1627 "php" 1725 "php"
1628 ], 1726 ],
1629 - "time": "2016-02-28 19:48:28" 1727 + "time": "2016-04-19 13:41:41"
1630 }, 1728 },
1631 { 1729 {
1632 "name": "paragonie/random_compat", 1730 "name": "paragonie/random_compat",
...@@ -1711,73 +1809,24 @@ ...@@ -1711,73 +1809,24 @@
1711 "time": "2014-02-01 15:22:28" 1809 "time": "2014-02-01 15:22:28"
1712 }, 1810 },
1713 { 1811 {
1714 - "name": "phpdocumentor/reflection-docblock",
1715 - "version": "2.0.4",
1716 - "source": {
1717 - "type": "git",
1718 - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
1719 - "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
1720 - },
1721 - "dist": {
1722 - "type": "zip",
1723 - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
1724 - "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
1725 - "shasum": ""
1726 - },
1727 - "require": {
1728 - "php": ">=5.3.3"
1729 - },
1730 - "require-dev": {
1731 - "phpunit/phpunit": "~4.0"
1732 - },
1733 - "suggest": {
1734 - "dflydev/markdown": "~1.0",
1735 - "erusev/parsedown": "~1.0"
1736 - },
1737 - "type": "library",
1738 - "extra": {
1739 - "branch-alias": {
1740 - "dev-master": "2.0.x-dev"
1741 - }
1742 - },
1743 - "autoload": {
1744 - "psr-0": {
1745 - "phpDocumentor": [
1746 - "src/"
1747 - ]
1748 - }
1749 - },
1750 - "notification-url": "https://packagist.org/downloads/",
1751 - "license": [
1752 - "MIT"
1753 - ],
1754 - "authors": [
1755 - {
1756 - "name": "Mike van Riel",
1757 - "email": "mike.vanriel@naenius.com"
1758 - }
1759 - ],
1760 - "time": "2015-02-03 12:10:50"
1761 - },
1762 - {
1763 "name": "predis/predis", 1812 "name": "predis/predis",
1764 - "version": "v1.0.3", 1813 + "version": "v1.1.1",
1765 "source": { 1814 "source": {
1766 "type": "git", 1815 "type": "git",
1767 "url": "https://github.com/nrk/predis.git", 1816 "url": "https://github.com/nrk/predis.git",
1768 - "reference": "84060b9034d756b4d79641667d7f9efe1aeb8e04" 1817 + "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1"
1769 }, 1818 },
1770 "dist": { 1819 "dist": {
1771 "type": "zip", 1820 "type": "zip",
1772 - "url": "https://api.github.com/repos/nrk/predis/zipball/84060b9034d756b4d79641667d7f9efe1aeb8e04", 1821 + "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
1773 - "reference": "84060b9034d756b4d79641667d7f9efe1aeb8e04", 1822 + "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
1774 "shasum": "" 1823 "shasum": ""
1775 }, 1824 },
1776 "require": { 1825 "require": {
1777 - "php": ">=5.3.2" 1826 + "php": ">=5.3.9"
1778 }, 1827 },
1779 "require-dev": { 1828 "require-dev": {
1780 - "phpunit/phpunit": "~4.0" 1829 + "phpunit/phpunit": "~4.8"
1781 }, 1830 },
1782 "suggest": { 1831 "suggest": {
1783 "ext-curl": "Allows access to Webdis when paired with phpiredis", 1832 "ext-curl": "Allows access to Webdis when paired with phpiredis",
...@@ -1800,14 +1849,14 @@ ...@@ -1800,14 +1849,14 @@
1800 "homepage": "http://clorophilla.net" 1849 "homepage": "http://clorophilla.net"
1801 } 1850 }
1802 ], 1851 ],
1803 - "description": "Flexible and feature-complete PHP client library for Redis", 1852 + "description": "Flexible and feature-complete Redis client for PHP and HHVM",
1804 "homepage": "http://github.com/nrk/predis", 1853 "homepage": "http://github.com/nrk/predis",
1805 "keywords": [ 1854 "keywords": [
1806 "nosql", 1855 "nosql",
1807 "predis", 1856 "predis",
1808 "redis" 1857 "redis"
1809 ], 1858 ],
1810 - "time": "2015-07-30 18:34:15" 1859 + "time": "2016-06-16 16:22:20"
1811 }, 1860 },
1812 { 1861 {
1813 "name": "psr/http-message", 1862 "name": "psr/http-message",
...@@ -1970,16 +2019,16 @@ ...@@ -1970,16 +2019,16 @@
1970 }, 2019 },
1971 { 2020 {
1972 "name": "swiftmailer/swiftmailer", 2021 "name": "swiftmailer/swiftmailer",
1973 - "version": "v5.4.1", 2022 + "version": "v5.4.2",
1974 "source": { 2023 "source": {
1975 "type": "git", 2024 "type": "git",
1976 "url": "https://github.com/swiftmailer/swiftmailer.git", 2025 "url": "https://github.com/swiftmailer/swiftmailer.git",
1977 - "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421" 2026 + "reference": "d8db871a54619458a805229a057ea2af33c753e8"
1978 }, 2027 },
1979 "dist": { 2028 "dist": {
1980 "type": "zip", 2029 "type": "zip",
1981 - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421", 2030 + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d8db871a54619458a805229a057ea2af33c753e8",
1982 - "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421", 2031 + "reference": "d8db871a54619458a805229a057ea2af33c753e8",
1983 "shasum": "" 2032 "shasum": ""
1984 }, 2033 },
1985 "require": { 2034 "require": {
...@@ -2019,20 +2068,20 @@ ...@@ -2019,20 +2068,20 @@
2019 "mail", 2068 "mail",
2020 "mailer" 2069 "mailer"
2021 ], 2070 ],
2022 - "time": "2015-06-06 14:19:39" 2071 + "time": "2016-05-01 08:45:47"
2023 }, 2072 },
2024 { 2073 {
2025 "name": "symfony/class-loader", 2074 "name": "symfony/class-loader",
2026 - "version": "v3.0.4", 2075 + "version": "v3.1.2",
2027 "source": { 2076 "source": {
2028 "type": "git", 2077 "type": "git",
2029 "url": "https://github.com/symfony/class-loader.git", 2078 "url": "https://github.com/symfony/class-loader.git",
2030 - "reference": "cbb7e6a9c0213a0cffa5d9065ee8214ca4e83877" 2079 + "reference": "0d0ac77c336eb73f35bebdf3e1f3695ac741bbc9"
2031 }, 2080 },
2032 "dist": { 2081 "dist": {
2033 "type": "zip", 2082 "type": "zip",
2034 - "url": "https://api.github.com/repos/symfony/class-loader/zipball/cbb7e6a9c0213a0cffa5d9065ee8214ca4e83877", 2083 + "url": "https://api.github.com/repos/symfony/class-loader/zipball/0d0ac77c336eb73f35bebdf3e1f3695ac741bbc9",
2035 - "reference": "cbb7e6a9c0213a0cffa5d9065ee8214ca4e83877", 2084 + "reference": "0d0ac77c336eb73f35bebdf3e1f3695ac741bbc9",
2036 "shasum": "" 2085 "shasum": ""
2037 }, 2086 },
2038 "require": { 2087 "require": {
...@@ -2048,7 +2097,7 @@ ...@@ -2048,7 +2097,7 @@
2048 "type": "library", 2097 "type": "library",
2049 "extra": { 2098 "extra": {
2050 "branch-alias": { 2099 "branch-alias": {
2051 - "dev-master": "3.0-dev" 2100 + "dev-master": "3.1-dev"
2052 } 2101 }
2053 }, 2102 },
2054 "autoload": { 2103 "autoload": {
...@@ -2075,20 +2124,20 @@ ...@@ -2075,20 +2124,20 @@
2075 ], 2124 ],
2076 "description": "Symfony ClassLoader Component", 2125 "description": "Symfony ClassLoader Component",
2077 "homepage": "https://symfony.com", 2126 "homepage": "https://symfony.com",
2078 - "time": "2016-03-30 10:41:14" 2127 + "time": "2016-06-29 05:41:56"
2079 }, 2128 },
2080 { 2129 {
2081 "name": "symfony/console", 2130 "name": "symfony/console",
2082 - "version": "v3.0.4", 2131 + "version": "v3.0.8",
2083 "source": { 2132 "source": {
2084 "type": "git", 2133 "type": "git",
2085 "url": "https://github.com/symfony/console.git", 2134 "url": "https://github.com/symfony/console.git",
2086 - "reference": "6b1175135bc2a74c08a28d89761272de8beed8cd" 2135 + "reference": "a7abb7153f6d1da47f87ec50274844e246b09d9f"
2087 }, 2136 },
2088 "dist": { 2137 "dist": {
2089 "type": "zip", 2138 "type": "zip",
2090 - "url": "https://api.github.com/repos/symfony/console/zipball/6b1175135bc2a74c08a28d89761272de8beed8cd", 2139 + "url": "https://api.github.com/repos/symfony/console/zipball/a7abb7153f6d1da47f87ec50274844e246b09d9f",
2091 - "reference": "6b1175135bc2a74c08a28d89761272de8beed8cd", 2140 + "reference": "a7abb7153f6d1da47f87ec50274844e246b09d9f",
2092 "shasum": "" 2141 "shasum": ""
2093 }, 2142 },
2094 "require": { 2143 "require": {
...@@ -2135,20 +2184,20 @@ ...@@ -2135,20 +2184,20 @@
2135 ], 2184 ],
2136 "description": "Symfony Console Component", 2185 "description": "Symfony Console Component",
2137 "homepage": "https://symfony.com", 2186 "homepage": "https://symfony.com",
2138 - "time": "2016-03-16 17:00:50" 2187 + "time": "2016-06-29 07:02:21"
2139 }, 2188 },
2140 { 2189 {
2141 "name": "symfony/debug", 2190 "name": "symfony/debug",
2142 - "version": "v3.0.4", 2191 + "version": "v3.0.8",
2143 "source": { 2192 "source": {
2144 "type": "git", 2193 "type": "git",
2145 "url": "https://github.com/symfony/debug.git", 2194 "url": "https://github.com/symfony/debug.git",
2146 - "reference": "a06d10888a45afd97534506afb058ec38d9ba35b" 2195 + "reference": "c54bc3539c3b87e86799533801e8ae0e971d78c2"
2147 }, 2196 },
2148 "dist": { 2197 "dist": {
2149 "type": "zip", 2198 "type": "zip",
2150 - "url": "https://api.github.com/repos/symfony/debug/zipball/a06d10888a45afd97534506afb058ec38d9ba35b", 2199 + "url": "https://api.github.com/repos/symfony/debug/zipball/c54bc3539c3b87e86799533801e8ae0e971d78c2",
2151 - "reference": "a06d10888a45afd97534506afb058ec38d9ba35b", 2200 + "reference": "c54bc3539c3b87e86799533801e8ae0e971d78c2",
2152 "shasum": "" 2201 "shasum": ""
2153 }, 2202 },
2154 "require": { 2203 "require": {
...@@ -2192,20 +2241,20 @@ ...@@ -2192,20 +2241,20 @@
2192 ], 2241 ],
2193 "description": "Symfony Debug Component", 2242 "description": "Symfony Debug Component",
2194 "homepage": "https://symfony.com", 2243 "homepage": "https://symfony.com",
2195 - "time": "2016-03-30 10:41:14" 2244 + "time": "2016-06-29 05:40:00"
2196 }, 2245 },
2197 { 2246 {
2198 "name": "symfony/event-dispatcher", 2247 "name": "symfony/event-dispatcher",
2199 - "version": "v3.0.4", 2248 + "version": "v3.1.2",
2200 "source": { 2249 "source": {
2201 "type": "git", 2250 "type": "git",
2202 "url": "https://github.com/symfony/event-dispatcher.git", 2251 "url": "https://github.com/symfony/event-dispatcher.git",
2203 - "reference": "9002dcf018d884d294b1ef20a6f968efc1128f39" 2252 + "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5"
2204 }, 2253 },
2205 "dist": { 2254 "dist": {
2206 "type": "zip", 2255 "type": "zip",
2207 - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9002dcf018d884d294b1ef20a6f968efc1128f39", 2256 + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7f9839ede2070f53e7e2f0849b9bd14748c434c5",
2208 - "reference": "9002dcf018d884d294b1ef20a6f968efc1128f39", 2257 + "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5",
2209 "shasum": "" 2258 "shasum": ""
2210 }, 2259 },
2211 "require": { 2260 "require": {
...@@ -2225,7 +2274,7 @@ ...@@ -2225,7 +2274,7 @@
2225 "type": "library", 2274 "type": "library",
2226 "extra": { 2275 "extra": {
2227 "branch-alias": { 2276 "branch-alias": {
2228 - "dev-master": "3.0-dev" 2277 + "dev-master": "3.1-dev"
2229 } 2278 }
2230 }, 2279 },
2231 "autoload": { 2280 "autoload": {
...@@ -2252,20 +2301,20 @@ ...@@ -2252,20 +2301,20 @@
2252 ], 2301 ],
2253 "description": "Symfony EventDispatcher Component", 2302 "description": "Symfony EventDispatcher Component",
2254 "homepage": "https://symfony.com", 2303 "homepage": "https://symfony.com",
2255 - "time": "2016-03-10 10:34:12" 2304 + "time": "2016-06-29 05:41:56"
2256 }, 2305 },
2257 { 2306 {
2258 "name": "symfony/finder", 2307 "name": "symfony/finder",
2259 - "version": "v3.0.4", 2308 + "version": "v3.0.8",
2260 "source": { 2309 "source": {
2261 "type": "git", 2310 "type": "git",
2262 "url": "https://github.com/symfony/finder.git", 2311 "url": "https://github.com/symfony/finder.git",
2263 - "reference": "c54e407b35bc098916704e9fd090da21da4c4f52" 2312 + "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9"
2264 }, 2313 },
2265 "dist": { 2314 "dist": {
2266 "type": "zip", 2315 "type": "zip",
2267 - "url": "https://api.github.com/repos/symfony/finder/zipball/c54e407b35bc098916704e9fd090da21da4c4f52", 2316 + "url": "https://api.github.com/repos/symfony/finder/zipball/3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9",
2268 - "reference": "c54e407b35bc098916704e9fd090da21da4c4f52", 2317 + "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9",
2269 "shasum": "" 2318 "shasum": ""
2270 }, 2319 },
2271 "require": { 2320 "require": {
...@@ -2301,20 +2350,20 @@ ...@@ -2301,20 +2350,20 @@
2301 ], 2350 ],
2302 "description": "Symfony Finder Component", 2351 "description": "Symfony Finder Component",
2303 "homepage": "https://symfony.com", 2352 "homepage": "https://symfony.com",
2304 - "time": "2016-03-10 11:13:05" 2353 + "time": "2016-06-29 05:40:00"
2305 }, 2354 },
2306 { 2355 {
2307 "name": "symfony/http-foundation", 2356 "name": "symfony/http-foundation",
2308 - "version": "v3.0.4", 2357 + "version": "v3.0.8",
2309 "source": { 2358 "source": {
2310 "type": "git", 2359 "type": "git",
2311 "url": "https://github.com/symfony/http-foundation.git", 2360 "url": "https://github.com/symfony/http-foundation.git",
2312 - "reference": "99f38445a874e7becb8afc4b4a79ee181cf6ec3f" 2361 + "reference": "1341139f906d295baa4f4abd55293d07e25a065a"
2313 }, 2362 },
2314 "dist": { 2363 "dist": {
2315 "type": "zip", 2364 "type": "zip",
2316 - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/99f38445a874e7becb8afc4b4a79ee181cf6ec3f", 2365 + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1341139f906d295baa4f4abd55293d07e25a065a",
2317 - "reference": "99f38445a874e7becb8afc4b4a79ee181cf6ec3f", 2366 + "reference": "1341139f906d295baa4f4abd55293d07e25a065a",
2318 "shasum": "" 2367 "shasum": ""
2319 }, 2368 },
2320 "require": { 2369 "require": {
...@@ -2354,20 +2403,20 @@ ...@@ -2354,20 +2403,20 @@
2354 ], 2403 ],
2355 "description": "Symfony HttpFoundation Component", 2404 "description": "Symfony HttpFoundation Component",
2356 "homepage": "https://symfony.com", 2405 "homepage": "https://symfony.com",
2357 - "time": "2016-03-27 14:50:32" 2406 + "time": "2016-06-29 07:02:21"
2358 }, 2407 },
2359 { 2408 {
2360 "name": "symfony/http-kernel", 2409 "name": "symfony/http-kernel",
2361 - "version": "v3.0.4", 2410 + "version": "v3.0.8",
2362 "source": { 2411 "source": {
2363 "type": "git", 2412 "type": "git",
2364 "url": "https://github.com/symfony/http-kernel.git", 2413 "url": "https://github.com/symfony/http-kernel.git",
2365 - "reference": "579f828489659d7b3430f4bd9b67b4618b387dea" 2414 + "reference": "177b63b2d50b63fa6d82ea41359ed9928cc7a1fb"
2366 }, 2415 },
2367 "dist": { 2416 "dist": {
2368 "type": "zip", 2417 "type": "zip",
2369 - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/579f828489659d7b3430f4bd9b67b4618b387dea", 2418 + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/177b63b2d50b63fa6d82ea41359ed9928cc7a1fb",
2370 - "reference": "579f828489659d7b3430f4bd9b67b4618b387dea", 2419 + "reference": "177b63b2d50b63fa6d82ea41359ed9928cc7a1fb",
2371 "shasum": "" 2420 "shasum": ""
2372 }, 2421 },
2373 "require": { 2422 "require": {
...@@ -2375,7 +2424,7 @@ ...@@ -2375,7 +2424,7 @@
2375 "psr/log": "~1.0", 2424 "psr/log": "~1.0",
2376 "symfony/debug": "~2.8|~3.0", 2425 "symfony/debug": "~2.8|~3.0",
2377 "symfony/event-dispatcher": "~2.8|~3.0", 2426 "symfony/event-dispatcher": "~2.8|~3.0",
2378 - "symfony/http-foundation": "~2.8|~3.0" 2427 + "symfony/http-foundation": "~2.8.8|~3.0.8|~3.1.2|~3.2"
2379 }, 2428 },
2380 "conflict": { 2429 "conflict": {
2381 "symfony/config": "<2.8" 2430 "symfony/config": "<2.8"
...@@ -2436,20 +2485,20 @@ ...@@ -2436,20 +2485,20 @@
2436 ], 2485 ],
2437 "description": "Symfony HttpKernel Component", 2486 "description": "Symfony HttpKernel Component",
2438 "homepage": "https://symfony.com", 2487 "homepage": "https://symfony.com",
2439 - "time": "2016-03-25 01:41:20" 2488 + "time": "2016-06-30 16:30:17"
2440 }, 2489 },
2441 { 2490 {
2442 "name": "symfony/polyfill-mbstring", 2491 "name": "symfony/polyfill-mbstring",
2443 - "version": "v1.1.1", 2492 + "version": "v1.2.0",
2444 "source": { 2493 "source": {
2445 "type": "git", 2494 "type": "git",
2446 "url": "https://github.com/symfony/polyfill-mbstring.git", 2495 "url": "https://github.com/symfony/polyfill-mbstring.git",
2447 - "reference": "1289d16209491b584839022f29257ad859b8532d" 2496 + "reference": "dff51f72b0706335131b00a7f49606168c582594"
2448 }, 2497 },
2449 "dist": { 2498 "dist": {
2450 "type": "zip", 2499 "type": "zip",
2451 - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", 2500 + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
2452 - "reference": "1289d16209491b584839022f29257ad859b8532d", 2501 + "reference": "dff51f72b0706335131b00a7f49606168c582594",
2453 "shasum": "" 2502 "shasum": ""
2454 }, 2503 },
2455 "require": { 2504 "require": {
...@@ -2461,7 +2510,7 @@ ...@@ -2461,7 +2510,7 @@
2461 "type": "library", 2510 "type": "library",
2462 "extra": { 2511 "extra": {
2463 "branch-alias": { 2512 "branch-alias": {
2464 - "dev-master": "1.1-dev" 2513 + "dev-master": "1.2-dev"
2465 } 2514 }
2466 }, 2515 },
2467 "autoload": { 2516 "autoload": {
...@@ -2495,20 +2544,20 @@ ...@@ -2495,20 +2544,20 @@
2495 "portable", 2544 "portable",
2496 "shim" 2545 "shim"
2497 ], 2546 ],
2498 - "time": "2016-01-20 09:13:37" 2547 + "time": "2016-05-18 14:26:46"
2499 }, 2548 },
2500 { 2549 {
2501 "name": "symfony/polyfill-php56", 2550 "name": "symfony/polyfill-php56",
2502 - "version": "v1.1.1", 2551 + "version": "v1.2.0",
2503 "source": { 2552 "source": {
2504 "type": "git", 2553 "type": "git",
2505 "url": "https://github.com/symfony/polyfill-php56.git", 2554 "url": "https://github.com/symfony/polyfill-php56.git",
2506 - "reference": "4d891fff050101a53a4caabb03277284942d1ad9" 2555 + "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a"
2507 }, 2556 },
2508 "dist": { 2557 "dist": {
2509 "type": "zip", 2558 "type": "zip",
2510 - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9", 2559 + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/3edf57a8fbf9a927533344cef65ad7e1cf31030a",
2511 - "reference": "4d891fff050101a53a4caabb03277284942d1ad9", 2560 + "reference": "3edf57a8fbf9a927533344cef65ad7e1cf31030a",
2512 "shasum": "" 2561 "shasum": ""
2513 }, 2562 },
2514 "require": { 2563 "require": {
...@@ -2518,7 +2567,7 @@ ...@@ -2518,7 +2567,7 @@
2518 "type": "library", 2567 "type": "library",
2519 "extra": { 2568 "extra": {
2520 "branch-alias": { 2569 "branch-alias": {
2521 - "dev-master": "1.1-dev" 2570 + "dev-master": "1.2-dev"
2522 } 2571 }
2523 }, 2572 },
2524 "autoload": { 2573 "autoload": {
...@@ -2551,20 +2600,20 @@ ...@@ -2551,20 +2600,20 @@
2551 "portable", 2600 "portable",
2552 "shim" 2601 "shim"
2553 ], 2602 ],
2554 - "time": "2016-01-20 09:13:37" 2603 + "time": "2016-05-18 14:26:46"
2555 }, 2604 },
2556 { 2605 {
2557 "name": "symfony/polyfill-util", 2606 "name": "symfony/polyfill-util",
2558 - "version": "v1.1.1", 2607 + "version": "v1.2.0",
2559 "source": { 2608 "source": {
2560 "type": "git", 2609 "type": "git",
2561 "url": "https://github.com/symfony/polyfill-util.git", 2610 "url": "https://github.com/symfony/polyfill-util.git",
2562 - "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4" 2611 + "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99"
2563 }, 2612 },
2564 "dist": { 2613 "dist": {
2565 "type": "zip", 2614 "type": "zip",
2566 - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", 2615 + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ef830ce3d218e622b221d6bfad42c751d974bf99",
2567 - "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", 2616 + "reference": "ef830ce3d218e622b221d6bfad42c751d974bf99",
2568 "shasum": "" 2617 "shasum": ""
2569 }, 2618 },
2570 "require": { 2619 "require": {
...@@ -2573,7 +2622,7 @@ ...@@ -2573,7 +2622,7 @@
2573 "type": "library", 2622 "type": "library",
2574 "extra": { 2623 "extra": {
2575 "branch-alias": { 2624 "branch-alias": {
2576 - "dev-master": "1.1-dev" 2625 + "dev-master": "1.2-dev"
2577 } 2626 }
2578 }, 2627 },
2579 "autoload": { 2628 "autoload": {
...@@ -2603,20 +2652,20 @@ ...@@ -2603,20 +2652,20 @@
2603 "polyfill", 2652 "polyfill",
2604 "shim" 2653 "shim"
2605 ], 2654 ],
2606 - "time": "2016-01-20 09:13:37" 2655 + "time": "2016-05-18 14:26:46"
2607 }, 2656 },
2608 { 2657 {
2609 "name": "symfony/process", 2658 "name": "symfony/process",
2610 - "version": "v3.0.4", 2659 + "version": "v3.0.8",
2611 "source": { 2660 "source": {
2612 "type": "git", 2661 "type": "git",
2613 "url": "https://github.com/symfony/process.git", 2662 "url": "https://github.com/symfony/process.git",
2614 - "reference": "e6f1f98bbd355d209a992bfff45e7edfbd4a0776" 2663 + "reference": "d7cde1f9d94d87060204f863779389b61c382eeb"
2615 }, 2664 },
2616 "dist": { 2665 "dist": {
2617 "type": "zip", 2666 "type": "zip",
2618 - "url": "https://api.github.com/repos/symfony/process/zipball/e6f1f98bbd355d209a992bfff45e7edfbd4a0776", 2667 + "url": "https://api.github.com/repos/symfony/process/zipball/d7cde1f9d94d87060204f863779389b61c382eeb",
2619 - "reference": "e6f1f98bbd355d209a992bfff45e7edfbd4a0776", 2668 + "reference": "d7cde1f9d94d87060204f863779389b61c382eeb",
2620 "shasum": "" 2669 "shasum": ""
2621 }, 2670 },
2622 "require": { 2671 "require": {
...@@ -2652,20 +2701,20 @@ ...@@ -2652,20 +2701,20 @@
2652 ], 2701 ],
2653 "description": "Symfony Process Component", 2702 "description": "Symfony Process Component",
2654 "homepage": "https://symfony.com", 2703 "homepage": "https://symfony.com",
2655 - "time": "2016-03-30 10:41:14" 2704 + "time": "2016-06-29 05:40:00"
2656 }, 2705 },
2657 { 2706 {
2658 "name": "symfony/routing", 2707 "name": "symfony/routing",
2659 - "version": "v3.0.4", 2708 + "version": "v3.0.8",
2660 "source": { 2709 "source": {
2661 "type": "git", 2710 "type": "git",
2662 "url": "https://github.com/symfony/routing.git", 2711 "url": "https://github.com/symfony/routing.git",
2663 - "reference": "d061b609f2d0769494c381ec92f5c5cc5e4a20aa" 2712 + "reference": "9038984bd9c05ab07280121e9e10f61a7231457b"
2664 }, 2713 },
2665 "dist": { 2714 "dist": {
2666 "type": "zip", 2715 "type": "zip",
2667 - "url": "https://api.github.com/repos/symfony/routing/zipball/d061b609f2d0769494c381ec92f5c5cc5e4a20aa", 2716 + "url": "https://api.github.com/repos/symfony/routing/zipball/9038984bd9c05ab07280121e9e10f61a7231457b",
2668 - "reference": "d061b609f2d0769494c381ec92f5c5cc5e4a20aa", 2717 + "reference": "9038984bd9c05ab07280121e9e10f61a7231457b",
2669 "shasum": "" 2718 "shasum": ""
2670 }, 2719 },
2671 "require": { 2720 "require": {
...@@ -2727,20 +2776,20 @@ ...@@ -2727,20 +2776,20 @@
2727 "uri", 2776 "uri",
2728 "url" 2777 "url"
2729 ], 2778 ],
2730 - "time": "2016-03-23 13:23:25" 2779 + "time": "2016-06-29 05:40:00"
2731 }, 2780 },
2732 { 2781 {
2733 "name": "symfony/translation", 2782 "name": "symfony/translation",
2734 - "version": "v3.0.4", 2783 + "version": "v3.0.8",
2735 "source": { 2784 "source": {
2736 "type": "git", 2785 "type": "git",
2737 "url": "https://github.com/symfony/translation.git", 2786 "url": "https://github.com/symfony/translation.git",
2738 - "reference": "f7a07af51ea067745a521dab1e3152044a2fb1f2" 2787 + "reference": "6bf844e1ee3c820c012386c10427a5c67bbefec8"
2739 }, 2788 },
2740 "dist": { 2789 "dist": {
2741 "type": "zip", 2790 "type": "zip",
2742 - "url": "https://api.github.com/repos/symfony/translation/zipball/f7a07af51ea067745a521dab1e3152044a2fb1f2", 2791 + "url": "https://api.github.com/repos/symfony/translation/zipball/6bf844e1ee3c820c012386c10427a5c67bbefec8",
2743 - "reference": "f7a07af51ea067745a521dab1e3152044a2fb1f2", 2792 + "reference": "6bf844e1ee3c820c012386c10427a5c67bbefec8",
2744 "shasum": "" 2793 "shasum": ""
2745 }, 2794 },
2746 "require": { 2795 "require": {
...@@ -2791,20 +2840,20 @@ ...@@ -2791,20 +2840,20 @@
2791 ], 2840 ],
2792 "description": "Symfony Translation Component", 2841 "description": "Symfony Translation Component",
2793 "homepage": "https://symfony.com", 2842 "homepage": "https://symfony.com",
2794 - "time": "2016-03-25 01:41:20" 2843 + "time": "2016-06-29 05:40:00"
2795 }, 2844 },
2796 { 2845 {
2797 "name": "symfony/var-dumper", 2846 "name": "symfony/var-dumper",
2798 - "version": "v3.0.4", 2847 + "version": "v3.0.8",
2799 "source": { 2848 "source": {
2800 "type": "git", 2849 "type": "git",
2801 "url": "https://github.com/symfony/var-dumper.git", 2850 "url": "https://github.com/symfony/var-dumper.git",
2802 - "reference": "3841ed86527d18ee2c35fe4afb1b2fc60f8fae79" 2851 + "reference": "2f046e9a9d571f22cc8b26783564876713b06579"
2803 }, 2852 },
2804 "dist": { 2853 "dist": {
2805 "type": "zip", 2854 "type": "zip",
2806 - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3841ed86527d18ee2c35fe4afb1b2fc60f8fae79", 2855 + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2f046e9a9d571f22cc8b26783564876713b06579",
2807 - "reference": "3841ed86527d18ee2c35fe4afb1b2fc60f8fae79", 2856 + "reference": "2f046e9a9d571f22cc8b26783564876713b06579",
2808 "shasum": "" 2857 "shasum": ""
2809 }, 2858 },
2810 "require": { 2859 "require": {
...@@ -2854,32 +2903,32 @@ ...@@ -2854,32 +2903,32 @@
2854 "debug", 2903 "debug",
2855 "dump" 2904 "dump"
2856 ], 2905 ],
2857 - "time": "2016-03-10 10:34:12" 2906 + "time": "2016-06-29 05:40:00"
2858 }, 2907 },
2859 { 2908 {
2860 "name": "vlucas/phpdotenv", 2909 "name": "vlucas/phpdotenv",
2861 - "version": "v2.2.0", 2910 + "version": "v2.3.0",
2862 "source": { 2911 "source": {
2863 "type": "git", 2912 "type": "git",
2864 "url": "https://github.com/vlucas/phpdotenv.git", 2913 "url": "https://github.com/vlucas/phpdotenv.git",
2865 - "reference": "9caf304153dc2288e4970caec6f1f3b3bc205412" 2914 + "reference": "9ca5644c536654e9509b9d257f53c58630eb2a6a"
2866 }, 2915 },
2867 "dist": { 2916 "dist": {
2868 "type": "zip", 2917 "type": "zip",
2869 - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9caf304153dc2288e4970caec6f1f3b3bc205412", 2918 + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9ca5644c536654e9509b9d257f53c58630eb2a6a",
2870 - "reference": "9caf304153dc2288e4970caec6f1f3b3bc205412", 2919 + "reference": "9ca5644c536654e9509b9d257f53c58630eb2a6a",
2871 "shasum": "" 2920 "shasum": ""
2872 }, 2921 },
2873 "require": { 2922 "require": {
2874 "php": ">=5.3.9" 2923 "php": ">=5.3.9"
2875 }, 2924 },
2876 "require-dev": { 2925 "require-dev": {
2877 - "phpunit/phpunit": "^4.8|^5.0" 2926 + "phpunit/phpunit": "^4.8 || ^5.0"
2878 }, 2927 },
2879 "type": "library", 2928 "type": "library",
2880 "extra": { 2929 "extra": {
2881 "branch-alias": { 2930 "branch-alias": {
2882 - "dev-master": "2.2-dev" 2931 + "dev-master": "2.3-dev"
2883 } 2932 }
2884 }, 2933 },
2885 "autoload": { 2934 "autoload": {
...@@ -2889,7 +2938,7 @@ ...@@ -2889,7 +2938,7 @@
2889 }, 2938 },
2890 "notification-url": "https://packagist.org/downloads/", 2939 "notification-url": "https://packagist.org/downloads/",
2891 "license": [ 2940 "license": [
2892 - "BSD" 2941 + "BSD-3-Clause-Attribution"
2893 ], 2942 ],
2894 "authors": [ 2943 "authors": [
2895 { 2944 {
...@@ -2899,13 +2948,12 @@ ...@@ -2899,13 +2948,12 @@
2899 } 2948 }
2900 ], 2949 ],
2901 "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", 2950 "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
2902 - "homepage": "http://github.com/vlucas/phpdotenv",
2903 "keywords": [ 2951 "keywords": [
2904 "dotenv", 2952 "dotenv",
2905 "env", 2953 "env",
2906 "environment" 2954 "environment"
2907 ], 2955 ],
2908 - "time": "2015-12-29 15:10:30" 2956 + "time": "2016-06-14 14:14:52"
2909 } 2957 }
2910 ], 2958 ],
2911 "packages-dev": [ 2959 "packages-dev": [
...@@ -2965,33 +3013,29 @@ ...@@ -2965,33 +3013,29 @@
2965 }, 3013 },
2966 { 3014 {
2967 "name": "fzaninotto/faker", 3015 "name": "fzaninotto/faker",
2968 - "version": "v1.5.0", 3016 + "version": "v1.6.0",
2969 "source": { 3017 "source": {
2970 "type": "git", 3018 "type": "git",
2971 "url": "https://github.com/fzaninotto/Faker.git", 3019 "url": "https://github.com/fzaninotto/Faker.git",
2972 - "reference": "d0190b156bcca848d401fb80f31f504f37141c8d" 3020 + "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
2973 }, 3021 },
2974 "dist": { 3022 "dist": {
2975 "type": "zip", 3023 "type": "zip",
2976 - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d", 3024 + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
2977 - "reference": "d0190b156bcca848d401fb80f31f504f37141c8d", 3025 + "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
2978 "shasum": "" 3026 "shasum": ""
2979 }, 3027 },
2980 "require": { 3028 "require": {
2981 - "php": ">=5.3.3" 3029 + "php": "^5.3.3|^7.0"
2982 }, 3030 },
2983 "require-dev": { 3031 "require-dev": {
3032 + "ext-intl": "*",
2984 "phpunit/phpunit": "~4.0", 3033 "phpunit/phpunit": "~4.0",
2985 "squizlabs/php_codesniffer": "~1.5" 3034 "squizlabs/php_codesniffer": "~1.5"
2986 }, 3035 },
2987 - "suggest": {
2988 - "ext-intl": "*"
2989 - },
2990 "type": "library", 3036 "type": "library",
2991 "extra": { 3037 "extra": {
2992 - "branch-alias": { 3038 + "branch-alias": []
2993 - "dev-master": "1.5.x-dev"
2994 - }
2995 }, 3039 },
2996 "autoload": { 3040 "autoload": {
2997 "psr-4": { 3041 "psr-4": {
...@@ -3013,7 +3057,7 @@ ...@@ -3013,7 +3057,7 @@
3013 "faker", 3057 "faker",
3014 "fixtures" 3058 "fixtures"
3015 ], 3059 ],
3016 - "time": "2015-05-29 06:29:14" 3060 + "time": "2016-04-29 12:21:54"
3017 }, 3061 },
3018 { 3062 {
3019 "name": "hamcrest/hamcrest-php", 3063 "name": "hamcrest/hamcrest-php",
...@@ -3062,16 +3106,16 @@ ...@@ -3062,16 +3106,16 @@
3062 }, 3106 },
3063 { 3107 {
3064 "name": "mockery/mockery", 3108 "name": "mockery/mockery",
3065 - "version": "0.9.4", 3109 + "version": "0.9.5",
3066 "source": { 3110 "source": {
3067 "type": "git", 3111 "type": "git",
3068 "url": "https://github.com/padraic/mockery.git", 3112 "url": "https://github.com/padraic/mockery.git",
3069 - "reference": "70bba85e4aabc9449626651f48b9018ede04f86b" 3113 + "reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2"
3070 }, 3114 },
3071 "dist": { 3115 "dist": {
3072 "type": "zip", 3116 "type": "zip",
3073 - "url": "https://api.github.com/repos/padraic/mockery/zipball/70bba85e4aabc9449626651f48b9018ede04f86b", 3117 + "url": "https://api.github.com/repos/padraic/mockery/zipball/4db079511a283e5aba1b3c2fb19037c645e70fc2",
3074 - "reference": "70bba85e4aabc9449626651f48b9018ede04f86b", 3118 + "reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2",
3075 "shasum": "" 3119 "shasum": ""
3076 }, 3120 },
3077 "require": { 3121 "require": {
...@@ -3123,7 +3167,153 @@ ...@@ -3123,7 +3167,153 @@
3123 "test double", 3167 "test double",
3124 "testing" 3168 "testing"
3125 ], 3169 ],
3126 - "time": "2015-04-02 19:54:00" 3170 + "time": "2016-05-22 21:52:33"
3171 + },
3172 + {
3173 + "name": "phpdocumentor/reflection-common",
3174 + "version": "1.0",
3175 + "source": {
3176 + "type": "git",
3177 + "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
3178 + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
3179 + },
3180 + "dist": {
3181 + "type": "zip",
3182 + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
3183 + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
3184 + "shasum": ""
3185 + },
3186 + "require": {
3187 + "php": ">=5.5"
3188 + },
3189 + "require-dev": {
3190 + "phpunit/phpunit": "^4.6"
3191 + },
3192 + "type": "library",
3193 + "extra": {
3194 + "branch-alias": {
3195 + "dev-master": "1.0.x-dev"
3196 + }
3197 + },
3198 + "autoload": {
3199 + "psr-4": {
3200 + "phpDocumentor\\Reflection\\": [
3201 + "src"
3202 + ]
3203 + }
3204 + },
3205 + "notification-url": "https://packagist.org/downloads/",
3206 + "license": [
3207 + "MIT"
3208 + ],
3209 + "authors": [
3210 + {
3211 + "name": "Jaap van Otterdijk",
3212 + "email": "opensource@ijaap.nl"
3213 + }
3214 + ],
3215 + "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
3216 + "homepage": "http://www.phpdoc.org",
3217 + "keywords": [
3218 + "FQSEN",
3219 + "phpDocumentor",
3220 + "phpdoc",
3221 + "reflection",
3222 + "static analysis"
3223 + ],
3224 + "time": "2015-12-27 11:43:31"
3225 + },
3226 + {
3227 + "name": "phpdocumentor/reflection-docblock",
3228 + "version": "3.1.0",
3229 + "source": {
3230 + "type": "git",
3231 + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
3232 + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
3233 + },
3234 + "dist": {
3235 + "type": "zip",
3236 + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
3237 + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
3238 + "shasum": ""
3239 + },
3240 + "require": {
3241 + "php": ">=5.5",
3242 + "phpdocumentor/reflection-common": "^1.0@dev",
3243 + "phpdocumentor/type-resolver": "^0.2.0",
3244 + "webmozart/assert": "^1.0"
3245 + },
3246 + "require-dev": {
3247 + "mockery/mockery": "^0.9.4",
3248 + "phpunit/phpunit": "^4.4"
3249 + },
3250 + "type": "library",
3251 + "autoload": {
3252 + "psr-4": {
3253 + "phpDocumentor\\Reflection\\": [
3254 + "src/"
3255 + ]
3256 + }
3257 + },
3258 + "notification-url": "https://packagist.org/downloads/",
3259 + "license": [
3260 + "MIT"
3261 + ],
3262 + "authors": [
3263 + {
3264 + "name": "Mike van Riel",
3265 + "email": "me@mikevanriel.com"
3266 + }
3267 + ],
3268 + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
3269 + "time": "2016-06-10 09:48:41"
3270 + },
3271 + {
3272 + "name": "phpdocumentor/type-resolver",
3273 + "version": "0.2",
3274 + "source": {
3275 + "type": "git",
3276 + "url": "https://github.com/phpDocumentor/TypeResolver.git",
3277 + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
3278 + },
3279 + "dist": {
3280 + "type": "zip",
3281 + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
3282 + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
3283 + "shasum": ""
3284 + },
3285 + "require": {
3286 + "php": ">=5.5",
3287 + "phpdocumentor/reflection-common": "^1.0"
3288 + },
3289 + "require-dev": {
3290 + "mockery/mockery": "^0.9.4",
3291 + "phpunit/phpunit": "^5.2||^4.8.24"
3292 + },
3293 + "type": "library",
3294 + "extra": {
3295 + "branch-alias": {
3296 + "dev-master": "1.0.x-dev"
3297 + }
3298 + },
3299 + "autoload": {
3300 + "psr-4": {
3301 + "phpDocumentor\\Reflection\\": [
3302 + "src/"
3303 + ]
3304 + }
3305 + },
3306 + "notification-url": "https://packagist.org/downloads/",
3307 + "license": [
3308 + "MIT"
3309 + ],
3310 + "authors": [
3311 + {
3312 + "name": "Mike van Riel",
3313 + "email": "me@mikevanriel.com"
3314 + }
3315 + ],
3316 + "time": "2016-06-10 07:14:17"
3127 }, 3317 },
3128 { 3318 {
3129 "name": "phpspec/php-diff", 3319 "name": "phpspec/php-diff",
...@@ -3239,32 +3429,32 @@ ...@@ -3239,32 +3429,32 @@
3239 }, 3429 },
3240 { 3430 {
3241 "name": "phpspec/prophecy", 3431 "name": "phpspec/prophecy",
3242 - "version": "v1.6.0", 3432 + "version": "v1.6.1",
3243 "source": { 3433 "source": {
3244 "type": "git", 3434 "type": "git",
3245 "url": "https://github.com/phpspec/prophecy.git", 3435 "url": "https://github.com/phpspec/prophecy.git",
3246 - "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972" 3436 + "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
3247 }, 3437 },
3248 "dist": { 3438 "dist": {
3249 "type": "zip", 3439 "type": "zip",
3250 - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972", 3440 + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
3251 - "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972", 3441 + "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
3252 "shasum": "" 3442 "shasum": ""
3253 }, 3443 },
3254 "require": { 3444 "require": {
3255 "doctrine/instantiator": "^1.0.2", 3445 "doctrine/instantiator": "^1.0.2",
3256 "php": "^5.3|^7.0", 3446 "php": "^5.3|^7.0",
3257 - "phpdocumentor/reflection-docblock": "~2.0", 3447 + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
3258 - "sebastian/comparator": "~1.1", 3448 + "sebastian/comparator": "^1.1",
3259 - "sebastian/recursion-context": "~1.0" 3449 + "sebastian/recursion-context": "^1.0"
3260 }, 3450 },
3261 "require-dev": { 3451 "require-dev": {
3262 - "phpspec/phpspec": "~2.0" 3452 + "phpspec/phpspec": "^2.0"
3263 }, 3453 },
3264 "type": "library", 3454 "type": "library",
3265 "extra": { 3455 "extra": {
3266 "branch-alias": { 3456 "branch-alias": {
3267 - "dev-master": "1.5.x-dev" 3457 + "dev-master": "1.6.x-dev"
3268 } 3458 }
3269 }, 3459 },
3270 "autoload": { 3460 "autoload": {
...@@ -3297,7 +3487,7 @@ ...@@ -3297,7 +3487,7 @@
3297 "spy", 3487 "spy",
3298 "stub" 3488 "stub"
3299 ], 3489 ],
3300 - "time": "2016-02-15 07:46:21" 3490 + "time": "2016-06-07 08:13:47"
3301 }, 3491 },
3302 { 3492 {
3303 "name": "phpunit/php-code-coverage", 3493 "name": "phpunit/php-code-coverage",
...@@ -3451,21 +3641,24 @@ ...@@ -3451,21 +3641,24 @@
3451 }, 3641 },
3452 { 3642 {
3453 "name": "phpunit/php-timer", 3643 "name": "phpunit/php-timer",
3454 - "version": "1.0.7", 3644 + "version": "1.0.8",
3455 "source": { 3645 "source": {
3456 "type": "git", 3646 "type": "git",
3457 "url": "https://github.com/sebastianbergmann/php-timer.git", 3647 "url": "https://github.com/sebastianbergmann/php-timer.git",
3458 - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" 3648 + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
3459 }, 3649 },
3460 "dist": { 3650 "dist": {
3461 "type": "zip", 3651 "type": "zip",
3462 - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", 3652 + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
3463 - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", 3653 + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
3464 "shasum": "" 3654 "shasum": ""
3465 }, 3655 },
3466 "require": { 3656 "require": {
3467 "php": ">=5.3.3" 3657 "php": ">=5.3.3"
3468 }, 3658 },
3659 + "require-dev": {
3660 + "phpunit/phpunit": "~4|~5"
3661 + },
3469 "type": "library", 3662 "type": "library",
3470 "autoload": { 3663 "autoload": {
3471 "classmap": [ 3664 "classmap": [
...@@ -3488,7 +3681,7 @@ ...@@ -3488,7 +3681,7 @@
3488 "keywords": [ 3681 "keywords": [
3489 "timer" 3682 "timer"
3490 ], 3683 ],
3491 - "time": "2015-06-21 08:01:12" 3684 + "time": "2016-05-12 18:03:57"
3492 }, 3685 },
3493 { 3686 {
3494 "name": "phpunit/php-token-stream", 3687 "name": "phpunit/php-token-stream",
...@@ -3541,16 +3734,16 @@ ...@@ -3541,16 +3734,16 @@
3541 }, 3734 },
3542 { 3735 {
3543 "name": "phpunit/phpunit", 3736 "name": "phpunit/phpunit",
3544 - "version": "4.8.24", 3737 + "version": "4.8.26",
3545 "source": { 3738 "source": {
3546 "type": "git", 3739 "type": "git",
3547 "url": "https://github.com/sebastianbergmann/phpunit.git", 3740 "url": "https://github.com/sebastianbergmann/phpunit.git",
3548 - "reference": "a1066c562c52900a142a0e2bbf0582994671385e" 3741 + "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
3549 }, 3742 },
3550 "dist": { 3743 "dist": {
3551 "type": "zip", 3744 "type": "zip",
3552 - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1066c562c52900a142a0e2bbf0582994671385e", 3745 + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
3553 - "reference": "a1066c562c52900a142a0e2bbf0582994671385e", 3746 + "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
3554 "shasum": "" 3747 "shasum": ""
3555 }, 3748 },
3556 "require": { 3749 "require": {
...@@ -3564,7 +3757,7 @@ ...@@ -3564,7 +3757,7 @@
3564 "phpunit/php-code-coverage": "~2.1", 3757 "phpunit/php-code-coverage": "~2.1",
3565 "phpunit/php-file-iterator": "~1.4", 3758 "phpunit/php-file-iterator": "~1.4",
3566 "phpunit/php-text-template": "~1.2", 3759 "phpunit/php-text-template": "~1.2",
3567 - "phpunit/php-timer": ">=1.0.6", 3760 + "phpunit/php-timer": "^1.0.6",
3568 "phpunit/phpunit-mock-objects": "~2.3", 3761 "phpunit/phpunit-mock-objects": "~2.3",
3569 "sebastian/comparator": "~1.1", 3762 "sebastian/comparator": "~1.1",
3570 "sebastian/diff": "~1.2", 3763 "sebastian/diff": "~1.2",
...@@ -3609,7 +3802,7 @@ ...@@ -3609,7 +3802,7 @@
3609 "testing", 3802 "testing",
3610 "xunit" 3803 "xunit"
3611 ], 3804 ],
3612 - "time": "2016-03-14 06:16:08" 3805 + "time": "2016-05-17 03:09:28"
3613 }, 3806 },
3614 { 3807 {
3615 "name": "phpunit/phpunit-mock-objects", 3808 "name": "phpunit/phpunit-mock-objects",
...@@ -3785,16 +3978,16 @@ ...@@ -3785,16 +3978,16 @@
3785 }, 3978 },
3786 { 3979 {
3787 "name": "sebastian/environment", 3980 "name": "sebastian/environment",
3788 - "version": "1.3.5", 3981 + "version": "1.3.7",
3789 "source": { 3982 "source": {
3790 "type": "git", 3983 "type": "git",
3791 "url": "https://github.com/sebastianbergmann/environment.git", 3984 "url": "https://github.com/sebastianbergmann/environment.git",
3792 - "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf" 3985 + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
3793 }, 3986 },
3794 "dist": { 3987 "dist": {
3795 "type": "zip", 3988 "type": "zip",
3796 - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", 3989 + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
3797 - "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", 3990 + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
3798 "shasum": "" 3991 "shasum": ""
3799 }, 3992 },
3800 "require": { 3993 "require": {
...@@ -3831,20 +4024,20 @@ ...@@ -3831,20 +4024,20 @@
3831 "environment", 4024 "environment",
3832 "hhvm" 4025 "hhvm"
3833 ], 4026 ],
3834 - "time": "2016-02-26 18:40:46" 4027 + "time": "2016-05-17 03:18:57"
3835 }, 4028 },
3836 { 4029 {
3837 "name": "sebastian/exporter", 4030 "name": "sebastian/exporter",
3838 - "version": "1.2.1", 4031 + "version": "1.2.2",
3839 "source": { 4032 "source": {
3840 "type": "git", 4033 "type": "git",
3841 "url": "https://github.com/sebastianbergmann/exporter.git", 4034 "url": "https://github.com/sebastianbergmann/exporter.git",
3842 - "reference": "7ae5513327cb536431847bcc0c10edba2701064e" 4035 + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
3843 }, 4036 },
3844 "dist": { 4037 "dist": {
3845 "type": "zip", 4038 "type": "zip",
3846 - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", 4039 + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
3847 - "reference": "7ae5513327cb536431847bcc0c10edba2701064e", 4040 + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
3848 "shasum": "" 4041 "shasum": ""
3849 }, 4042 },
3850 "require": { 4043 "require": {
...@@ -3852,12 +4045,13 @@ ...@@ -3852,12 +4045,13 @@
3852 "sebastian/recursion-context": "~1.0" 4045 "sebastian/recursion-context": "~1.0"
3853 }, 4046 },
3854 "require-dev": { 4047 "require-dev": {
4048 + "ext-mbstring": "*",
3855 "phpunit/phpunit": "~4.4" 4049 "phpunit/phpunit": "~4.4"
3856 }, 4050 },
3857 "type": "library", 4051 "type": "library",
3858 "extra": { 4052 "extra": {
3859 "branch-alias": { 4053 "branch-alias": {
3860 - "dev-master": "1.2.x-dev" 4054 + "dev-master": "1.3.x-dev"
3861 } 4055 }
3862 }, 4056 },
3863 "autoload": { 4057 "autoload": {
...@@ -3897,7 +4091,7 @@ ...@@ -3897,7 +4091,7 @@
3897 "export", 4091 "export",
3898 "exporter" 4092 "exporter"
3899 ], 4093 ],
3900 - "time": "2015-06-21 07:55:53" 4094 + "time": "2016-06-17 09:04:28"
3901 }, 4095 },
3902 { 4096 {
3903 "name": "sebastian/global-state", 4097 "name": "sebastian/global-state",
...@@ -4040,16 +4234,16 @@ ...@@ -4040,16 +4234,16 @@
4040 }, 4234 },
4041 { 4235 {
4042 "name": "symfony/css-selector", 4236 "name": "symfony/css-selector",
4043 - "version": "v3.0.4", 4237 + "version": "v3.1.2",
4044 "source": { 4238 "source": {
4045 "type": "git", 4239 "type": "git",
4046 "url": "https://github.com/symfony/css-selector.git", 4240 "url": "https://github.com/symfony/css-selector.git",
4047 - "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0" 4241 + "reference": "2851e1932d77ce727776154d659b232d061e816a"
4048 }, 4242 },
4049 "dist": { 4243 "dist": {
4050 "type": "zip", 4244 "type": "zip",
4051 - "url": "https://api.github.com/repos/symfony/css-selector/zipball/65e764f404685f2dc20c057e889b3ad04b2e2db0", 4245 + "url": "https://api.github.com/repos/symfony/css-selector/zipball/2851e1932d77ce727776154d659b232d061e816a",
4052 - "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0", 4246 + "reference": "2851e1932d77ce727776154d659b232d061e816a",
4053 "shasum": "" 4247 "shasum": ""
4054 }, 4248 },
4055 "require": { 4249 "require": {
...@@ -4058,7 +4252,7 @@ ...@@ -4058,7 +4252,7 @@
4058 "type": "library", 4252 "type": "library",
4059 "extra": { 4253 "extra": {
4060 "branch-alias": { 4254 "branch-alias": {
4061 - "dev-master": "3.0-dev" 4255 + "dev-master": "3.1-dev"
4062 } 4256 }
4063 }, 4257 },
4064 "autoload": { 4258 "autoload": {
...@@ -4089,20 +4283,20 @@ ...@@ -4089,20 +4283,20 @@
4089 ], 4283 ],
4090 "description": "Symfony CssSelector Component", 4284 "description": "Symfony CssSelector Component",
4091 "homepage": "https://symfony.com", 4285 "homepage": "https://symfony.com",
4092 - "time": "2016-03-04 07:55:57" 4286 + "time": "2016-06-29 05:41:56"
4093 }, 4287 },
4094 { 4288 {
4095 "name": "symfony/dom-crawler", 4289 "name": "symfony/dom-crawler",
4096 - "version": "v3.0.4", 4290 + "version": "v3.1.2",
4097 "source": { 4291 "source": {
4098 "type": "git", 4292 "type": "git",
4099 "url": "https://github.com/symfony/dom-crawler.git", 4293 "url": "https://github.com/symfony/dom-crawler.git",
4100 - "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f" 4294 + "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0"
4101 }, 4295 },
4102 "dist": { 4296 "dist": {
4103 "type": "zip", 4297 "type": "zip",
4104 - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/18a06d7a9af41718c20764a674a0ebba3bc40d1f", 4298 + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
4105 - "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f", 4299 + "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
4106 "shasum": "" 4300 "shasum": ""
4107 }, 4301 },
4108 "require": { 4302 "require": {
...@@ -4118,7 +4312,7 @@ ...@@ -4118,7 +4312,7 @@
4118 "type": "library", 4312 "type": "library",
4119 "extra": { 4313 "extra": {
4120 "branch-alias": { 4314 "branch-alias": {
4121 - "dev-master": "3.0-dev" 4315 + "dev-master": "3.1-dev"
4122 } 4316 }
4123 }, 4317 },
4124 "autoload": { 4318 "autoload": {
...@@ -4145,20 +4339,20 @@ ...@@ -4145,20 +4339,20 @@
4145 ], 4339 ],
4146 "description": "Symfony DomCrawler Component", 4340 "description": "Symfony DomCrawler Component",
4147 "homepage": "https://symfony.com", 4341 "homepage": "https://symfony.com",
4148 - "time": "2016-03-23 13:23:25" 4342 + "time": "2016-06-29 05:41:56"
4149 }, 4343 },
4150 { 4344 {
4151 "name": "symfony/yaml", 4345 "name": "symfony/yaml",
4152 - "version": "v3.0.4", 4346 + "version": "v3.1.2",
4153 "source": { 4347 "source": {
4154 "type": "git", 4348 "type": "git",
4155 "url": "https://github.com/symfony/yaml.git", 4349 "url": "https://github.com/symfony/yaml.git",
4156 - "reference": "0047c8366744a16de7516622c5b7355336afae96" 4350 + "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de"
4157 }, 4351 },
4158 "dist": { 4352 "dist": {
4159 "type": "zip", 4353 "type": "zip",
4160 - "url": "https://api.github.com/repos/symfony/yaml/zipball/0047c8366744a16de7516622c5b7355336afae96", 4354 + "url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de",
4161 - "reference": "0047c8366744a16de7516622c5b7355336afae96", 4355 + "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de",
4162 "shasum": "" 4356 "shasum": ""
4163 }, 4357 },
4164 "require": { 4358 "require": {
...@@ -4167,7 +4361,7 @@ ...@@ -4167,7 +4361,7 @@
4167 "type": "library", 4361 "type": "library",
4168 "extra": { 4362 "extra": {
4169 "branch-alias": { 4363 "branch-alias": {
4170 - "dev-master": "3.0-dev" 4364 + "dev-master": "3.1-dev"
4171 } 4365 }
4172 }, 4366 },
4173 "autoload": { 4367 "autoload": {
...@@ -4194,7 +4388,56 @@ ...@@ -4194,7 +4388,56 @@
4194 ], 4388 ],
4195 "description": "Symfony Yaml Component", 4389 "description": "Symfony Yaml Component",
4196 "homepage": "https://symfony.com", 4390 "homepage": "https://symfony.com",
4197 - "time": "2016-03-04 07:55:57" 4391 + "time": "2016-06-29 05:41:56"
4392 + },
4393 + {
4394 + "name": "webmozart/assert",
4395 + "version": "1.0.2",
4396 + "source": {
4397 + "type": "git",
4398 + "url": "https://github.com/webmozart/assert.git",
4399 + "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
4400 + },
4401 + "dist": {
4402 + "type": "zip",
4403 + "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
4404 + "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
4405 + "shasum": ""
4406 + },
4407 + "require": {
4408 + "php": ">=5.3.3"
4409 + },
4410 + "require-dev": {
4411 + "phpunit/phpunit": "^4.6"
4412 + },
4413 + "type": "library",
4414 + "extra": {
4415 + "branch-alias": {
4416 + "dev-master": "1.0-dev"
4417 + }
4418 + },
4419 + "autoload": {
4420 + "psr-4": {
4421 + "Webmozart\\Assert\\": "src/"
4422 + }
4423 + },
4424 + "notification-url": "https://packagist.org/downloads/",
4425 + "license": [
4426 + "MIT"
4427 + ],
4428 + "authors": [
4429 + {
4430 + "name": "Bernhard Schussek",
4431 + "email": "bschussek@gmail.com"
4432 + }
4433 + ],
4434 + "description": "Assertions to validate method input/output with nice error messages.",
4435 + "keywords": [
4436 + "assert",
4437 + "check",
4438 + "validate"
4439 + ],
4440 + "time": "2015-08-24 13:29:44"
4198 } 4441 }
4199 ], 4442 ],
4200 "aliases": [], 4443 "aliases": [],
......
...@@ -60,6 +60,18 @@ ...@@ -60,6 +60,18 @@
60 word-break: break-word; 60 word-break: break-word;
61 hyphens: auto; 61 hyphens: auto;
62 } 62 }
63 +
64 + // diffs
65 + .diff-html-removed,
66 + .diff-html-added {
67 + text-decoration: none;
68 + }
69 + .diff-html-added {
70 + background: rgba(45, 255, 0, 0.2);
71 + }
72 + .diff-html-removed {
73 + background: rgba(255, 0, 0, 0.2);
74 + }
63 } 75 }
64 76
65 // Page content pointers 77 // Page content pointers
......
...@@ -18,5 +18,9 @@ ...@@ -18,5 +18,9 @@
18 18
19 <div style="clear:left;"></div> 19 <div style="clear:left;"></div>
20 20
21 - {!! $page->html !!} 21 + @if (isset($diff) && $diff)
22 + {!! $diff !!}
23 + @else
24 + {!! $page->html !!}
25 + @endif
22 </div> 26 </div>
...\ No newline at end of file ...\ No newline at end of file
......