Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Updated composer.json to allow Symfony 2.2 and removed composer.lock

  • Loading branch information...
commit 79e16bd70b11a1655439e064837183ae9cbf3956 1 parent 5f6c07f
Tyler Sommer tyler-sommer authored

Showing 2 changed files with 1 addition and 575 deletions. Show diff stats Hide diff stats

  1. +1 1  composer.json
  2. +0 574 composer.lock
2  composer.json
@@ -21,7 +21,7 @@
21 21 "require": {
22 22 "php": ">=5.3.0",
23 23 "kriswallsmith/assetic": ">=1.0",
24   - "symfony/finder": "2.1.*"
  24 + "symfony/finder": ">=2.1,<2.3"
25 25 },
26 26 "require-dev": {
27 27 "silex/silex": "*",
574 composer.lock
... ... @@ -1,574 +0,0 @@
1   -{
2   - "hash": "d59c22efe4cf0de74d30765c7e5dc913",
3   - "packages": [
4   - {
5   - "name": "kriswallsmith/assetic",
6   - "version": "dev-master",
7   - "source": {
8   - "type": "git",
9   - "url": "http://github.com/kriswallsmith/assetic.git",
10   - "reference": "a6baab9b4c4361aca51bf90ee47c1586dff3cb0c"
11   - },
12   - "dist": {
13   - "type": "zip",
14   - "url": "https://github.com/kriswallsmith/assetic/zipball/a6baab9b4c4361aca51bf90ee47c1586dff3cb0c",
15   - "reference": "a6baab9b4c4361aca51bf90ee47c1586dff3cb0c",
16   - "shasum": ""
17   - },
18   - "require": {
19   - "symfony/process": "2.1.*",
20   - "php": ">=5.3.1"
21   - },
22   - "require-dev": {
23   - "twig/twig": ">=1.6.0,<2.0",
24   - "leafo/lessphp": "*",
25   - "leafo/scssphp": "*",
26   - "ptachoire/cssembed": "*",
27   - "leafo/scssphp-compass": "*"
28   - },
29   - "suggest": {
30   - "twig/twig": "Assetic provides the integration with the Twig templating engine",
31   - "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
32   - "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler",
33   - "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
34   - "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin"
35   - },
36   - "time": "1347622188",
37   - "type": "library",
38   - "extra": {
39   - "branch-alias": {
40   - "dev-master": "1.1-dev"
41   - }
42   - },
43   - "installation-source": "source",
44   - "autoload": {
45   - "psr-0": {
46   - "Assetic": "src/"
47   - },
48   - "files": [
49   - "src/functions.php"
50   - ]
51   - },
52   - "license": [
53   - "MIT"
54   - ],
55   - "authors": [
56   - {
57   - "name": "Kris Wallsmith",
58   - "email": "kris.wallsmith@gmail.com",
59   - "homepage": "http://kriswallsmith.net/"
60   - }
61   - ],
62   - "description": "Asset Management for PHP",
63   - "homepage": "https://github.com/kriswallsmith/assetic",
64   - "keywords": [
65   - "assets",
66   - "compression",
67   - "minification"
68   - ]
69   - },
70   - {
71   - "name": "symfony/finder",
72   - "version": "2.1.x-dev",
73   - "target-dir": "Symfony/Component/Finder",
74   - "source": {
75   - "type": "git",
76   - "url": "https://github.com/symfony/Finder",
77   - "reference": "v2.1.0-RC2"
78   - },
79   - "dist": {
80   - "type": "zip",
81   - "url": "https://github.com/symfony/Finder/zipball/v2.1.0-RC2",
82   - "reference": "v2.1.0-RC2",
83   - "shasum": ""
84   - },
85   - "require": {
86   - "php": ">=5.3.3"
87   - },
88   - "time": "1345643321",
89   - "type": "library",
90   - "extra": {
91   - "branch-alias": {
92   - "dev-master": "2.1-dev"
93   - }
94   - },
95   - "installation-source": "source",
96   - "autoload": {
97   - "psr-0": {
98   - "Symfony\\Component\\Finder": ""
99   - }
100   - },
101   - "license": [
102   - "MIT"
103   - ],
104   - "authors": [
105   - {
106   - "name": "Fabien Potencier",
107   - "email": "fabien@symfony.com"
108   - },
109   - {
110   - "name": "Symfony Community",
111   - "homepage": "http://symfony.com/contributors"
112   - }
113   - ],
114   - "description": "Symfony Finder Component",
115   - "homepage": "http://symfony.com"
116   - },
117   - {
118   - "name": "symfony/process",
119   - "version": "2.1.x-dev",
120   - "target-dir": "Symfony/Component/Process",
121   - "source": {
122   - "type": "git",
123   - "url": "https://github.com/symfony/Process",
124   - "reference": "v2.1.2"
125   - },
126   - "dist": {
127   - "type": "zip",
128   - "url": "https://github.com/symfony/Process/zipball/v2.1.2",
129   - "reference": "v2.1.2",
130   - "shasum": ""
131   - },
132   - "require": {
133   - "php": ">=5.3.3"
134   - },
135   - "time": "1348007849",
136   - "type": "library",
137   - "extra": {
138   - "branch-alias": {
139   - "dev-master": "2.1-dev"
140   - }
141   - },
142   - "installation-source": "source",
143   - "autoload": {
144   - "psr-0": {
145   - "Symfony\\Component\\Process": ""
146   - }
147   - },
148   - "license": [
149   - "MIT"
150   - ],
151   - "authors": [
152   - {
153   - "name": "Fabien Potencier",
154   - "email": "fabien@symfony.com"
155   - },
156   - {
157   - "name": "Symfony Community",
158   - "homepage": "http://symfony.com/contributors"
159   - }
160   - ],
161   - "description": "Symfony Process Component",
162   - "homepage": "http://symfony.com"
163   - }
164   - ],
165   - "packages-dev": [
166   - {
167   - "name": "pimple/pimple",
168   - "version": "dev-master",
169   - "source": {
170   - "type": "git",
171   - "url": "git://github.com/fabpot/Pimple.git",
172   - "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3"
173   - },
174   - "dist": {
175   - "type": "zip",
176   - "url": "https://github.com/fabpot/Pimple/zipball/b9f27b8dc18c08f00627dec02359b46a24791dc3",
177   - "reference": "b9f27b8dc18c08f00627dec02359b46a24791dc3",
178   - "shasum": ""
179   - },
180   - "require": {
181   - "php": ">=5.3.0"
182   - },
183   - "time": "1347278988",
184   - "type": "library",
185   - "extra": {
186   - "branch-alias": {
187   - "dev-master": "1.0.x-dev"
188   - }
189   - },
190   - "installation-source": "source",
191   - "autoload": {
192   - "psr-0": {
193   - "Pimple": "lib/"
194   - }
195   - },
196   - "license": [
197   - "MIT"
198   - ],
199   - "authors": [
200   - {
201   - "name": "Fabien Potencier",
202   - "email": "fabien@symfony.com"
203   - }
204   - ],
205   - "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
206   - "homepage": "http://pimple.sensiolabs.org",
207   - "keywords": [
208   - "dependency injection",
209   - "container"
210   - ]
211   - },
212   - {
213   - "name": "silex/silex",
214   - "version": "dev-master",
215   - "source": {
216   - "type": "git",
217   - "url": "git://github.com/fabpot/Silex.git",
218   - "reference": "9b63007bbdf6a5f68ab402c76fbaf9df56c67342"
219   - },
220   - "dist": {
221   - "type": "zip",
222   - "url": "https://github.com/fabpot/Silex/zipball/9b63007bbdf6a5f68ab402c76fbaf9df56c67342",
223   - "reference": "9b63007bbdf6a5f68ab402c76fbaf9df56c67342",
224   - "shasum": ""
225   - },
226   - "require": {
227   - "symfony/event-dispatcher": "2.1.*",
228   - "symfony/http-foundation": "2.1.*",
229   - "symfony/http-kernel": "2.1.*",
230   - "symfony/routing": "2.1.*",
231   - "php": ">=5.3.3",
232   - "pimple/pimple": "1.*"
233   - },
234   - "require-dev": {
235   - "symfony/form": "2.1.*",
236   - "symfony/translation": "2.1.*",
237   - "symfony/twig-bridge": "2.1.*",
238   - "symfony/validator": "2.1.*",
239   - "symfony/monolog-bridge": "2.1.*",
240   - "symfony/browser-kit": "2.1.*",
241   - "symfony/css-selector": "2.1.*",
242   - "symfony/finder": "2.1.*",
243   - "symfony/process": "2.1.*",
244   - "symfony/security": "2.1.*",
245   - "monolog/monolog": ">=1.0.0,<1.2-dev",
246   - "symfony/config": "2.1.*",
247   - "symfony/locale": "2.1.*",
248   - "twig/twig": ">=1.8.0,<2.0-dev",
249   - "swiftmailer/swiftmailer": "4.2.*",
250   - "doctrine/dbal": ">=2.2.0,<2.4.0-dev"
251   - },
252   - "suggest": {
253   - "symfony/browser-kit": "2.1.*",
254   - "symfony/css-selector": "2.1.*",
255   - "symfony/dom-crawler": "2.1.*"
256   - },
257   - "time": "1348229548",
258   - "type": "library",
259   - "extra": {
260   - "branch-alias": {
261   - "dev-master": "1.0-dev"
262   - }
263   - },
264   - "installation-source": "source",
265   - "autoload": {
266   - "psr-0": {
267   - "Silex": "src/"
268   - }
269   - },
270   - "license": [
271   - "MIT"
272   - ],
273   - "authors": [
274   - {
275   - "name": "Fabien Potencier",
276   - "email": "fabien@symfony.com"
277   - },
278   - {
279   - "name": "Igor Wiedler",
280   - "email": "igor@wiedler.ch",
281   - "homepage": "http://wiedler.ch/igor/"
282   - }
283   - ],
284   - "description": "The PHP micro-framework based on the Symfony2 Components",
285   - "homepage": "http://silex.sensiolabs.org",
286   - "keywords": [
287   - "microframework"
288   - ]
289   - },
290   - {
291   - "name": "symfony/event-dispatcher",
292   - "version": "2.1.x-dev",
293   - "target-dir": "Symfony/Component/EventDispatcher",
294   - "source": {
295   - "type": "git",
296   - "url": "https://github.com/symfony/EventDispatcher",
297   - "reference": "v2.1.2"
298   - },
299   - "dist": {
300   - "type": "zip",
301   - "url": "https://github.com/symfony/EventDispatcher/zipball/v2.1.2",
302   - "reference": "v2.1.2",
303   - "shasum": ""
304   - },
305   - "require": {
306   - "php": ">=5.3.3"
307   - },
308   - "require-dev": {
309   - "symfony/dependency-injection": "2.1.*"
310   - },
311   - "suggest": {
312   - "symfony/dependency-injection": "2.1.*",
313   - "symfony/http-kernel": "2.1.*"
314   - },
315   - "time": "1347274422",
316   - "type": "library",
317   - "extra": {
318   - "branch-alias": {
319   - "dev-master": "2.1-dev"
320   - }
321   - },
322   - "installation-source": "source",
323   - "autoload": {
324   - "psr-0": {
325   - "Symfony\\Component\\EventDispatcher": ""
326   - }
327   - },
328   - "license": [
329   - "MIT"
330   - ],
331   - "authors": [
332   - {
333   - "name": "Fabien Potencier",
334   - "email": "fabien@symfony.com"
335   - },
336   - {
337   - "name": "Symfony Community",
338   - "homepage": "http://symfony.com/contributors"
339   - }
340   - ],
341   - "description": "Symfony EventDispatcher Component",
342   - "homepage": "http://symfony.com"
343   - },
344   - {
345   - "name": "symfony/http-foundation",
346   - "version": "2.1.x-dev",
347   - "target-dir": "Symfony/Component/HttpFoundation",
348   - "source": {
349   - "type": "git",
350   - "url": "https://github.com/symfony/HttpFoundation",
351   - "reference": "386a332456060076778ba8e6b84bed0480eaa69c"
352   - },
353   - "dist": {
354   - "type": "zip",
355   - "url": "https://github.com/symfony/HttpFoundation/zipball/386a332456060076778ba8e6b84bed0480eaa69c",
356   - "reference": "386a332456060076778ba8e6b84bed0480eaa69c",
357   - "shasum": ""
358   - },
359   - "require": {
360   - "php": ">=5.3.3"
361   - },
362   - "time": "1348208027",
363   - "type": "library",
364   - "extra": {
365   - "branch-alias": {
366   - "dev-master": "2.1-dev"
367   - }
368   - },
369   - "installation-source": "source",
370   - "autoload": {
371   - "psr-0": {
372   - "Symfony\\Component\\HttpFoundation": "",
373   - "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs"
374   - }
375   - },
376   - "license": [
377   - "MIT"
378   - ],
379   - "authors": [
380   - {
381   - "name": "Fabien Potencier",
382   - "email": "fabien@symfony.com"
383   - },
384   - {
385   - "name": "Symfony Community",
386   - "homepage": "http://symfony.com/contributors"
387   - }
388   - ],
389   - "description": "Symfony HttpFoundation Component",
390   - "homepage": "http://symfony.com"
391   - },
392   - {
393   - "name": "symfony/http-kernel",
394   - "version": "2.1.x-dev",
395   - "target-dir": "Symfony/Component/HttpKernel",
396   - "source": {
397   - "type": "git",
398   - "url": "https://github.com/symfony/HttpKernel",
399   - "reference": "10f8418126cba9f7e510eb57e53810d41f9f2add"
400   - },
401   - "dist": {
402   - "type": "zip",
403   - "url": "https://github.com/symfony/HttpKernel/zipball/10f8418126cba9f7e510eb57e53810d41f9f2add",
404   - "reference": "10f8418126cba9f7e510eb57e53810d41f9f2add",
405   - "shasum": ""
406   - },
407   - "require": {
408   - "php": ">=5.3.3",
409   - "symfony/event-dispatcher": "2.1.*",
410   - "symfony/http-foundation": "2.1.*"
411   - },
412   - "require-dev": {
413   - "symfony/browser-kit": "2.1.*",
414   - "symfony/class-loader": "2.1.*",
415   - "symfony/config": "2.1.*",
416   - "symfony/console": "2.1.*",
417   - "symfony/dependency-injection": "2.1.*",
418   - "symfony/finder": "2.1.*",
419   - "symfony/process": "2.1.*",
420   - "symfony/routing": "2.1.*"
421   - },
422   - "suggest": {
423   - "symfony/browser-kit": "2.1.*",
424   - "symfony/class-loader": "2.1.*",
425   - "symfony/config": "2.1.*",
426   - "symfony/console": "2.1.*",
427   - "symfony/dependency-injection": "2.1.*",
428   - "symfony/finder": "2.1.*"
429   - },
430   - "time": "1348209286",
431   - "type": "library",
432   - "extra": {
433   - "branch-alias": {
434   - "dev-master": "2.1-dev"
435   - }
436   - },
437   - "installation-source": "source",
438   - "autoload": {
439   - "psr-0": {
440   - "Symfony\\Component\\HttpKernel": ""
441   - }
442   - },
443   - "license": [
444   - "MIT"
445   - ],
446   - "authors": [
447   - {
448   - "name": "Fabien Potencier",
449   - "email": "fabien@symfony.com"
450   - },
451   - {
452   - "name": "Symfony Community",
453   - "homepage": "http://symfony.com/contributors"
454   - }
455   - ],
456   - "description": "Symfony HttpKernel Component",
457   - "homepage": "http://symfony.com"
458   - },
459   - {
460   - "name": "symfony/routing",
461   - "version": "2.1.x-dev",
462   - "target-dir": "Symfony/Component/Routing",
463   - "source": {
464   - "type": "git",
465   - "url": "https://github.com/symfony/Routing",
466   - "reference": "v2.1.2"
467   - },
468   - "dist": {
469   - "type": "zip",
470   - "url": "https://github.com/symfony/Routing/zipball/v2.1.2",
471   - "reference": "v2.1.2",
472   - "shasum": ""
473   - },
474   - "require": {
475   - "php": ">=5.3.3"
476   - },
477   - "require-dev": {
478   - "symfony/config": "2.1.*",
479   - "symfony/yaml": "2.1.*",
480   - "symfony/http-kernel": "2.1.*",
481   - "doctrine/common": ">=2.2,<2.4-dev"
482   - },
483   - "suggest": {
484   - "doctrine/common": ">=2.2,<2.4-dev",
485   - "symfony/config": "2.1.*",
486   - "symfony/yaml": "2.1.*"
487   - },
488   - "time": "1347274422",
489   - "type": "library",
490   - "extra": {
491   - "branch-alias": {
492   - "dev-master": "2.1-dev"
493   - }
494   - },
495   - "installation-source": "source",
496   - "autoload": {
497   - "psr-0": {
498   - "Symfony\\Component\\Routing": ""
499   - }
500   - },
501   - "license": [
502   - "MIT"
503   - ],
504   - "authors": [
505   - {
506   - "name": "Fabien Potencier",
507   - "email": "fabien@symfony.com"
508   - },
509   - {
510   - "name": "Symfony Community",
511   - "homepage": "http://symfony.com/contributors"
512   - }
513   - ],
514   - "description": "Symfony Routing Component",
515   - "homepage": "http://symfony.com"
516   - },
517   - {
518   - "name": "twig/twig",
519   - "version": "dev-master",
520   - "source": {
521   - "type": "git",
522   - "url": "git://github.com/fabpot/Twig.git",
523   - "reference": "b4d1d62b82e83c6fd3d5a6cd46a186de64275bb4"
524   - },
525   - "dist": {
526   - "type": "zip",
527   - "url": "https://github.com/fabpot/Twig/zipball/b4d1d62b82e83c6fd3d5a6cd46a186de64275bb4",
528   - "reference": "b4d1d62b82e83c6fd3d5a6cd46a186de64275bb4",
529   - "shasum": ""
530   - },
531   - "require": {
532   - "php": ">=5.2.4"
533   - },
534   - "time": "1347961095",
535   - "type": "library",
536   - "extra": {
537   - "branch-alias": {
538   - "dev-master": "1.10-dev"
539   - }
540   - },
541   - "installation-source": "source",
542   - "autoload": {
543   - "psr-0": {
544   - "Twig_": "lib/"
545   - }
546   - },
547   - "license": [
548   - "BSD-3"
549   - ],
550   - "authors": [
551   - {
552   - "name": "Fabien Potencier",
553   - "email": "fabien@symfony.com"
554   - },
555   - {
556   - "name": "Armin Ronacher",
557   - "email": "armin.ronacher@active-4.com"
558   - }
559   - ],
560   - "description": "Twig, the flexible, fast, and secure template language for PHP",
561   - "homepage": "http://twig.sensiolabs.org",
562   - "keywords": [
563   - "templating"
564   - ]
565   - }
566   - ],
567   - "aliases": [
568   -
569   - ],
570   - "minimum-stability": "dev",
571   - "stability-flags": [
572   -
573   - ]
574   -}

0 comments on commit 79e16bd

Please sign in to comment.
Something went wrong with that request. Please try again.