Skip to content

Commit 820cc06

Browse files
SwaderSwader
committed
Version 2.0 incoming
1 parent 4a9e333 commit 820cc06

File tree

9 files changed

+534
-20
lines changed

9 files changed

+534
-20
lines changed

‎.puli/GeneratedPuliFactory.php

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
<?php
2+
3+
namespace Puli;
4+
5+
use Puli\Discovery\Api\Discovery;
6+
use Puli\Discovery\Binding\Initializer\ResourceBindingInitializer;
7+
use Puli\Discovery\JsonDiscovery;
8+
use Puli\Manager\Api\Server\ServerCollection;
9+
use Puli\Repository\Api\ResourceRepository;
10+
use Puli\Repository\JsonRepository;
11+
use Puli\UrlGenerator\Api\UrlGenerator;
12+
use Puli\UrlGenerator\DiscoveryUrlGenerator;
13+
use RuntimeException;
14+
15+
/**
16+
* Creates Puli's core services.
17+
*
18+
* This class was auto-generated by Puli.
19+
*
20+
* IMPORTANT: Before modifying the code below, set the "factory.auto-generate"
21+
* configuration key to false:
22+
*
23+
* $ puli config factory.auto-generate false
24+
*
25+
* Otherwise any modifications will be overwritten!
26+
*/
27+
class GeneratedPuliFactory
28+
{
29+
/**
30+
* Creates the resource repository.
31+
*
32+
* @return ResourceRepository The created resource repository.
33+
*/
34+
public function createRepository()
35+
{
36+
if (!interface_exists('Puli\Repository\Api\ResourceRepository')) {
37+
throw new RuntimeException('Please install puli/repository to create ResourceRepository instances.');
38+
}
39+
40+
$repo = new JsonRepository(__DIR__.'/path-mappings.json', __DIR__.'/..', true);
41+
42+
return $repo;
43+
}
44+
45+
/**
46+
* Creates the resource discovery.
47+
*
48+
* @param ResourceRepository $repo The resource repository to read from.
49+
*
50+
* @return Discovery The created discovery.
51+
*/
52+
public function createDiscovery(ResourceRepository $repo)
53+
{
54+
if (!interface_exists('Puli\Discovery\Api\Discovery')) {
55+
throw new RuntimeException('Please install puli/discovery to create Discovery instances.');
56+
}
57+
58+
$discovery = new JsonDiscovery(__DIR__.'/bindings.json', array(
59+
new ResourceBindingInitializer($repo),
60+
));
61+
62+
return $discovery;
63+
}
64+
65+
/**
66+
* Creates the URL generator.
67+
*
68+
* @param Discovery $discovery The discovery to read from.
69+
*
70+
* @return UrlGenerator The created URL generator.
71+
*/
72+
public function createUrlGenerator(Discovery $discovery)
73+
{
74+
if (!interface_exists('Puli\UrlGenerator\Api\UrlGenerator')) {
75+
throw new RuntimeException('Please install puli/url-generator to create UrlGenerator instances.');
76+
}
77+
78+
$generator = new DiscoveryUrlGenerator($discovery, array());
79+
80+
return $generator;
81+
}
82+
83+
/**
84+
* Returns the order in which the installed packages should be loaded
85+
* according to the override statements.
86+
*
87+
* @return string[] The sorted package names.
88+
*/
89+
public function getPackageOrder()
90+
{
91+
$order = array(
92+
'swader/diffbot-php-client',
93+
'clue/stream-filter',
94+
'doctrine/annotations',
95+
'doctrine/instantiator',
96+
'doctrine/lexer',
97+
'guzzle/guzzle',
98+
'guzzlehttp/guzzle',
99+
'guzzlehttp/promises',
100+
'guzzlehttp/psr7',
101+
'jms/metadata',
102+
'jms/parser-lib',
103+
'jms/serializer',
104+
'justinrainbow/json-schema',
105+
'myclabs/deep-copy',
106+
'nesbot/carbon',
107+
'php-http/client-common',
108+
'php-http/discovery',
109+
'php-http/guzzle6-adapter',
110+
'php-http/httplug',
111+
'php-http/message',
112+
'php-http/message-factory',
113+
'php-http/promise',
114+
'phpcollection/phpcollection',
115+
'phpdocumentor/reflection-docblock',
116+
'phpoption/phpoption',
117+
'phpspec/prophecy',
118+
'phpunit/php-code-coverage',
119+
'phpunit/php-file-iterator',
120+
'phpunit/php-text-template',
121+
'phpunit/php-timer',
122+
'phpunit/php-token-stream',
123+
'phpunit/phpunit',
124+
'phpunit/phpunit-mock-objects',
125+
'psr/http-message',
126+
'psr/log',
127+
'puli/composer-plugin',
128+
'puli/discovery',
129+
'puli/repository',
130+
'puli/url-generator',
131+
'ramsey/uuid',
132+
'scrutinizer/ocular',
133+
'sebastian/code-unit-reverse-lookup',
134+
'sebastian/comparator',
135+
'sebastian/diff',
136+
'sebastian/environment',
137+
'sebastian/exporter',
138+
'sebastian/global-state',
139+
'sebastian/recursion-context',
140+
'sebastian/resource-operations',
141+
'sebastian/version',
142+
'seld/jsonlint',
143+
'symfony/console',
144+
'symfony/event-dispatcher',
145+
'symfony/polyfill-mbstring',
146+
'symfony/process',
147+
'symfony/translation',
148+
'symfony/var-dumper',
149+
'symfony/yaml',
150+
'webmozart/assert',
151+
'webmozart/expression',
152+
'webmozart/glob',
153+
'webmozart/json',
154+
'webmozart/path-util',
155+
);
156+
157+
return $order;
158+
}
159+
}

‎.puli/bindings.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"keysByTypeName": {
3+
"Http\\Client\\HttpAsyncClient": 0,
4+
"Http\\Client\\HttpClient": 1,
5+
"Http\\Message\\MessageFactory": 2,
6+
"Http\\Message\\RequestFactory": 3,
7+
"Http\\Message\\ResponseFactory": 4,
8+
"Http\\Message\\StreamFactory": 5,
9+
"Http\\Message\\UriFactory": 6,
10+
"puli/public-resource": 7
11+
},
12+
"keysByUuid": {
13+
"04b5a002-71a8-473d-a8df-75671551b84a": 1,
14+
"9c856476-7f6b-43df-a740-15420a5f839c": 0,
15+
"064d003d-78a1-48c4-8f3b-1f92ff25da69": 2,
16+
"2438c2d0-0658-441f-8855-ddaf0f87d54d": 2,
17+
"253aa08c-d705-46e7-b1d2-e28c97eef792": 3,
18+
"273a34f9-62f4-4ba1-9801-b1284d49ff89": 5,
19+
"304b83db-b594-4d83-ae75-1f633adf92f7": 6,
20+
"3f4bc1cd-aa95-4702-9fa7-65408e471691": 6,
21+
"6234e947-d3bd-43eb-97d5-7f9e22e6bb1b": 4,
22+
"95c1be8f-39fe-4abd-8351-92cb14379a75": 5,
23+
"a018af27-7590-4dcf-83a1-497f95604cd6": 4,
24+
"c07955b1-de46-43db-923b-d07fae9382cb": 3
25+
},
26+
"typesByKey": [
27+
"O:35:\"Puli\\Discovery\\Api\\Type\\BindingType\":3:{s:41:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000name\";s:27:\"Http\\Client\\HttpAsyncClient\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000parameters\";a:0:{}s:53:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000acceptedBindings\";a:0:{}}",
28+
"O:35:\"Puli\\Discovery\\Api\\Type\\BindingType\":3:{s:41:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000name\";s:22:\"Http\\Client\\HttpClient\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000parameters\";a:0:{}s:53:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000acceptedBindings\";a:0:{}}",
29+
"O:35:\"Puli\\Discovery\\Api\\Type\\BindingType\":3:{s:41:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000name\";s:27:\"Http\\Message\\MessageFactory\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000parameters\";a:1:{s:7:\"depends\";O:40:\"Puli\\Discovery\\Api\\Type\\BindingParameter\":3:{s:46:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000name\";s:7:\"depends\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000flags\";i:0;s:54:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000defaultValue\";N;}}s:53:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000acceptedBindings\";a:0:{}}",
30+
"O:35:\"Puli\\Discovery\\Api\\Type\\BindingType\":3:{s:41:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000name\";s:27:\"Http\\Message\\RequestFactory\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000parameters\";a:1:{s:7:\"depends\";O:40:\"Puli\\Discovery\\Api\\Type\\BindingParameter\":3:{s:46:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000name\";s:7:\"depends\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000flags\";i:0;s:54:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000defaultValue\";N;}}s:53:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000acceptedBindings\";a:0:{}}",
31+
"O:35:\"Puli\\Discovery\\Api\\Type\\BindingType\":3:{s:41:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000name\";s:28:\"Http\\Message\\ResponseFactory\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000parameters\";a:1:{s:7:\"depends\";O:40:\"Puli\\Discovery\\Api\\Type\\BindingParameter\":3:{s:46:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000name\";s:7:\"depends\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000flags\";i:0;s:54:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000defaultValue\";N;}}s:53:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000acceptedBindings\";a:0:{}}",
32+
"O:35:\"Puli\\Discovery\\Api\\Type\\BindingType\":3:{s:41:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000name\";s:26:\"Http\\Message\\StreamFactory\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000parameters\";a:1:{s:7:\"depends\";O:40:\"Puli\\Discovery\\Api\\Type\\BindingParameter\":3:{s:46:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000name\";s:7:\"depends\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000flags\";i:0;s:54:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000defaultValue\";N;}}s:53:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000acceptedBindings\";a:0:{}}",
33+
"O:35:\"Puli\\Discovery\\Api\\Type\\BindingType\":3:{s:41:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000name\";s:23:\"Http\\Message\\UriFactory\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000parameters\";a:1:{s:7:\"depends\";O:40:\"Puli\\Discovery\\Api\\Type\\BindingParameter\":3:{s:46:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000name\";s:7:\"depends\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000flags\";i:0;s:54:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000defaultValue\";N;}}s:53:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000acceptedBindings\";a:0:{}}",
34+
"O:35:\"Puli\\Discovery\\Api\\Type\\BindingType\":3:{s:41:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000name\";s:20:\"puli/public-resource\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000parameters\";a:2:{s:4:\"path\";O:40:\"Puli\\Discovery\\Api\\Type\\BindingParameter\":3:{s:46:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000name\";s:4:\"path\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000flags\";i:0;s:54:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000defaultValue\";s:1:\"/\";}s:6:\"server\";O:40:\"Puli\\Discovery\\Api\\Type\\BindingParameter\":3:{s:46:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000name\";s:6:\"server\";s:47:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000flags\";i:1;s:54:\"\u0000Puli\\Discovery\\Api\\Type\\BindingParameter\u0000defaultValue\";N;}}s:53:\"\u0000Puli\\Discovery\\Api\\Type\\BindingType\u0000acceptedBindings\";a:0:{}}"
35+
],
36+
"bindingsByKey": {
37+
"1": "a:1:{i:0;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":137:{a:4:{i:0;s:22:\"Http\\Client\\HttpClient\";i:1;a:0:{}i:2;s:36:\"04b5a002-71a8-473d-a8df-75671551b84a\";i:3;s:27:\"Http\\Adapter\\Guzzle6\\Client\";}}}",
38+
"0": "a:1:{i:0;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":142:{a:4:{i:0;s:27:\"Http\\Client\\HttpAsyncClient\";i:1;a:0:{}i:2;s:36:\"9c856476-7f6b-43df-a740-15420a5f839c\";i:3;s:27:\"Http\\Adapter\\Guzzle6\\Client\";}}}",
39+
"2": "a:2:{i:0;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":210:{a:4:{i:0;s:27:\"Http\\Message\\MessageFactory\";i:1;a:1:{s:7:\"depends\";s:22:\"Zend\\Diactoros\\Request\";}i:2;s:36:\"064d003d-78a1-48c4-8f3b-1f92ff25da69\";i:3;s:51:\"Http\\Message\\MessageFactory\\DiactorosMessageFactory\";}}i:1;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":208:{a:4:{i:0;s:27:\"Http\\Message\\MessageFactory\";i:1;a:1:{s:7:\"depends\";s:23:\"GuzzleHttp\\Psr7\\Request\";}i:2;s:36:\"2438c2d0-0658-441f-8855-ddaf0f87d54d\";i:3;s:48:\"Http\\Message\\MessageFactory\\GuzzleMessageFactory\";}}}",
40+
"3": "a:2:{i:0;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":208:{a:4:{i:0;s:27:\"Http\\Message\\RequestFactory\";i:1;a:1:{s:7:\"depends\";s:23:\"GuzzleHttp\\Psr7\\Request\";}i:2;s:36:\"253aa08c-d705-46e7-b1d2-e28c97eef792\";i:3;s:48:\"Http\\Message\\MessageFactory\\GuzzleMessageFactory\";}}i:1;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":210:{a:4:{i:0;s:27:\"Http\\Message\\RequestFactory\";i:1;a:1:{s:7:\"depends\";s:22:\"Zend\\Diactoros\\Request\";}i:2;s:36:\"c07955b1-de46-43db-923b-d07fae9382cb\";i:3;s:51:\"Http\\Message\\MessageFactory\\DiactorosMessageFactory\";}}}",
41+
"5": "a:2:{i:0;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":204:{a:4:{i:0;s:26:\"Http\\Message\\StreamFactory\";i:1;a:1:{s:7:\"depends\";s:22:\"GuzzleHttp\\Psr7\\Stream\";}i:2;s:36:\"273a34f9-62f4-4ba1-9801-b1284d49ff89\";i:3;s:46:\"Http\\Message\\StreamFactory\\GuzzleStreamFactory\";}}i:1;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":206:{a:4:{i:0;s:26:\"Http\\Message\\StreamFactory\";i:1;a:1:{s:7:\"depends\";s:21:\"Zend\\Diactoros\\Stream\";}i:2;s:36:\"95c1be8f-39fe-4abd-8351-92cb14379a75\";i:3;s:49:\"Http\\Message\\StreamFactory\\DiactorosStreamFactory\";}}}",
42+
"6": "a:2:{i:0;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":192:{a:4:{i:0;s:23:\"Http\\Message\\UriFactory\";i:1;a:1:{s:7:\"depends\";s:19:\"GuzzleHttp\\Psr7\\Uri\";}i:2;s:36:\"304b83db-b594-4d83-ae75-1f633adf92f7\";i:3;s:40:\"Http\\Message\\UriFactory\\GuzzleUriFactory\";}}i:1;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":194:{a:4:{i:0;s:23:\"Http\\Message\\UriFactory\";i:1;a:1:{s:7:\"depends\";s:18:\"Zend\\Diactoros\\Uri\";}i:2;s:36:\"3f4bc1cd-aa95-4702-9fa7-65408e471691\";i:3;s:43:\"Http\\Message\\UriFactory\\DiactorosUriFactory\";}}}",
43+
"4": "a:2:{i:0;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":212:{a:4:{i:0;s:28:\"Http\\Message\\ResponseFactory\";i:1;a:1:{s:7:\"depends\";s:23:\"Zend\\Diactoros\\Response\";}i:2;s:36:\"6234e947-d3bd-43eb-97d5-7f9e22e6bb1b\";i:3;s:51:\"Http\\Message\\MessageFactory\\DiactorosMessageFactory\";}}i:1;C:35:\"Puli\\Discovery\\Binding\\ClassBinding\":210:{a:4:{i:0;s:28:\"Http\\Message\\ResponseFactory\";i:1;a:1:{s:7:\"depends\";s:24:\"GuzzleHttp\\Psr7\\Response\";}i:2;s:36:\"a018af27-7590-4dcf-83a1-497f95604cd6\";i:3;s:48:\"Http\\Message\\MessageFactory\\GuzzleMessageFactory\";}}}"
44+
},
45+
"nextKey": 8
46+
}

‎.puli/path-mappings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"/": null
3+
}

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
#Changelog
22
All notable changes will be documented in this file
33

4+
## 2.0. - Feburary 13th, 2016
5+
6+
- [Enhancement, BC Break] - Httplug packages now at 1.0+, deps updated accordingly
7+
- [Enhancement] - Raised PHP version constraint. Package no longer usable on unsupported PHP versions
8+
9+
---
10+
411
## 1.2. - November 8th, 2015
512

613
- [Enhancement] Suggested Carbon as helper library

‎composer.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,17 @@
1818
}
1919
],
2020
"require": {
21-
"php": ">=5.4.0",
21+
"php": "^5.5|7.*",
2222
"php-http/client-implementation": "^1.0",
23-
"php-http/utils": "dev-master",
24-
"php-http/discovery": "dev-master"
23+
"php-http/client-common": "^1",
24+
"php-http/discovery": "^0.8",
25+
"puli/composer-plugin": "^1.0@beta",
26+
"php-http/message": "^1.0"
2527
},
2628
"require-dev": {
27-
"symfony/var-dumper": "~2",
28-
"phpunit/phpunit": "^5.0",
29-
"php-http/guzzle6-adapter": "~0.2@dev",
29+
"symfony/var-dumper": "^3",
30+
"phpunit/phpunit": "^5",
31+
"php-http/guzzle6-adapter": "^1",
3032
"scrutinizer/ocular": "^1.1",
3133
"nesbot/carbon": "^1.21"
3234
},
@@ -42,7 +44,7 @@
4244
},
4345
"extra": {
4446
"branch-alias": {
45-
"dev-master": "1.1-dev"
47+
"dev-master": "2.1-dev"
4648
}
4749
},
4850
"suggest": {

0 commit comments

Comments
 (0)