Browse files

Ammendments to composer.json patch

  • Loading branch information...
1 parent 22f1993 commit 74ae4faf402b2a5c96ecda51d5e67aa6543e9eb7 @igorw igorw committed Aug 9, 2012
Showing with 252 additions and 54 deletions.
  1. +0 −4 .gitignore
  2. +0 −9 .gitmodules
  3. +20 −19 composer.json
  4. +229 −0 composer.lock
  5. +3 −22 tests/bootstrap.php
View
4 .gitignore
@@ -1,5 +1 @@
-.DS_Store
-.idea
-composer.phar
vendor
-composer.lock
View
9 .gitmodules
@@ -1,9 +0,0 @@
-[submodule "vendor/FOS/RestBundle"]
- path = vendor/FOS/RestBundle
- url = https://github.com/FriendsOfSymfony/FOSRestBundle
-[submodule "vendor/Symfony/Component/Serializer"]
- path = vendor/Symfony/Component/Serializer
- url = https://github.com/symfony/Serializer
-[submodule "vendor/silex"]
- path = vendor/silex
- url = https://github.com/fabpot/Silex
View
39 composer.json
@@ -1,20 +1,21 @@
{
- "name": "flintstones/rest",
- "description": "Adding some REST capabilities to [Silex][1], so you can more easily build RESTful APIs. 110% Buzzword-Driven.",
- "keywords": ["rest","silex"],
- "authors": [
- {
- "name": "Igor Wiedler"
- }
- ],
-
- "require": {
- "friendsofsymfony/rest-bundle": "*",
- "symfony/serializer": "2.1.x",
- "silex/silex": "1.0.*",
- "symfony/class-loader": "2.1.x"
- },
-
- "minimum-stability": "dev"
-
-}
+ "name": "flintstones/rest",
+ "description": "Adding some REST capabilities to Silex, so you can more easily build RESTful APIs. 110% Buzzword-Driven.",
+ "keywords": ["rest", "silex"],
+ "authors": [
+ {
+ "name": "Igor Wiedler",
+ "email": "igor@wiedler.ch"
+ }
+ ],
+ "require": {
+ "friendsofsymfony/rest-bundle": "*",
+ "symfony/serializer": "2.1.x",
+ "silex/silex": "1.0.*"
+ },
+ "autoload": {
+ "psr-0": { "Flintstones": "src" }
+ },
+ "target-dir": "Flintstones/Rest",
+ "minimum-stability": "dev"
+}
View
229 composer.lock
@@ -0,0 +1,229 @@
+{
+ "hash": "9c5593cf974cc30c555a443bdcc0c000",
+ "packages": [
+ {
+ "package": "doctrine/common",
+ "version": "2.3.x-dev",
+ "source-reference": "2ec4bc6db13db6a0976a16b71058083c55cbcdbd",
+ "commit-date": "1343847076"
+ },
+ {
+ "package": "friendsofsymfony/rest",
+ "version": "dev-master",
+ "alias-pretty-version": "0.7.x-dev",
+ "alias-version": "0.7.9999999.9999999-dev"
+ },
+ {
+ "package": "friendsofsymfony/rest",
+ "version": "dev-master",
+ "source-reference": "5ea703f5a3f5c7110cadeccb91b212c0eb7ea2d0",
+ "commit-date": "1339701893"
+ },
+ {
+ "package": "friendsofsymfony/rest-bundle",
+ "version": "dev-master",
+ "source-reference": "fcb32e0aace5d0e1f00f8243483bde3fe01f77f9",
+ "commit-date": "1344290444"
+ },
+ {
+ "package": "jms/metadata",
+ "version": "dev-master",
+ "alias-pretty-version": "1.2.x-dev",
+ "alias-version": "1.2.9999999.9999999-dev"
+ },
+ {
+ "package": "jms/metadata",
+ "version": "dev-master",
+ "source-reference": "dbfbb15b3ffdf96c5ff14e5cd4451d78a7083a36",
+ "commit-date": "1339680164"
+ },
+ {
+ "package": "jms/serializer-bundle",
+ "version": "dev-master",
+ "alias-pretty-version": "0.9.x-dev",
+ "alias-version": "0.9.9999999.9999999-dev"
+ },
+ {
+ "package": "jms/serializer-bundle",
+ "version": "dev-master",
+ "source-reference": "1f308a587742246e87e580290f3bae23073d1d70",
+ "commit-date": "1343641450"
+ },
+ {
+ "package": "pimple/pimple",
+ "version": "dev-master",
+ "alias-pretty-version": "1.0.x-dev",
+ "alias-version": "1.0.9999999.9999999-dev"
+ },
+ {
+ "package": "pimple/pimple",
+ "version": "dev-master",
+ "source-reference": "db836b8cfadc0f39dacafa2bf311a1ab603600bb",
+ "commit-date": "1343051648"
+ },
+ {
+ "package": "sensio/framework-extra-bundle",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "sensio/framework-extra-bundle",
+ "version": "dev-master",
+ "source-reference": "ade2d53b20a9fc3428f04c863b3fd4fca0b62181",
+ "commit-date": "1344072374"
+ },
+ {
+ "package": "silex/silex",
+ "version": "dev-master",
+ "alias-pretty-version": "1.0.x-dev",
+ "alias-version": "1.0.9999999.9999999-dev"
+ },
+ {
+ "package": "silex/silex",
+ "version": "dev-master",
+ "source-reference": "6d7cf048c704c0c58276b01eccfacab4dd11d013",
+ "commit-date": "1344453846"
+ },
+ {
+ "package": "symfony/config",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/config",
+ "version": "dev-master",
+ "source-reference": "v2.1.0-RC1",
+ "commit-date": "1343512949"
+ },
+ {
+ "package": "symfony/dependency-injection",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/dependency-injection",
+ "version": "dev-master",
+ "source-reference": "v2.1.0-RC1",
+ "commit-date": "1343997870"
+ },
+ {
+ "package": "symfony/event-dispatcher",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/event-dispatcher",
+ "version": "dev-master",
+ "source-reference": "v2.1.0-RC1",
+ "commit-date": "1342739894"
+ },
+ {
+ "package": "symfony/filesystem",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/filesystem",
+ "version": "dev-master",
+ "source-reference": "v2.1.0-RC1",
+ "commit-date": "1343491637"
+ },
+ {
+ "package": "symfony/framework-bundle",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/framework-bundle",
+ "version": "dev-master",
+ "source-reference": "45db4bfca544054ae059e1ddd2b6f818fee0df86",
+ "commit-date": "1344264516"
+ },
+ {
+ "package": "symfony/http-foundation",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/http-foundation",
+ "version": "dev-master",
+ "source-reference": "v2.1.0-RC1",
+ "commit-date": "1344071918"
+ },
+ {
+ "package": "symfony/http-kernel",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/http-kernel",
+ "version": "dev-master",
+ "source-reference": "0d0ee371ab0425f3399dba9e25d7ad98ca5c0d62",
+ "commit-date": "1344074675"
+ },
+ {
+ "package": "symfony/routing",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/routing",
+ "version": "dev-master",
+ "source-reference": "v2.1.0-RC1",
+ "commit-date": "1343744077"
+ },
+ {
+ "package": "symfony/serializer",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/serializer",
+ "version": "dev-master",
+ "source-reference": "v2.1.0-RC1",
+ "commit-date": "1343307511"
+ },
+ {
+ "package": "symfony/templating",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/templating",
+ "version": "dev-master",
+ "source-reference": "v2.1.0-RC1",
+ "commit-date": "1343982509"
+ },
+ {
+ "package": "symfony/translation",
+ "version": "dev-master",
+ "alias-pretty-version": "2.1.x-dev",
+ "alias-version": "2.1.9999999.9999999-dev"
+ },
+ {
+ "package": "symfony/translation",
+ "version": "dev-master",
+ "source-reference": "v2.1.0-RC1",
+ "commit-date": "1343512949"
+ }
+ ],
+ "packages-dev": null,
+ "aliases": [
+
+ ],
+ "minimum-stability": "dev",
+ "stability-flags": [
+
+ ]
+}
View
25 tests/bootstrap.php
@@ -1,24 +1,5 @@
<?php
-/*
- * This file is part of the Flintstones RestServiceProvider.
- *
- * (c) Igor Wiedler <igor@wiedler.ch>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$file = __DIR__.'/../vendor/autoload.php';
-if (!file_exists($file)) {
- throw new RuntimeException('Install dependencies to run test suite.');
-}
-
-$autoload = require_once $file;
-
-use Symfony\Component\ClassLoader\UniversalClassLoader;
-
-$loader = new UniversalClassLoader();
-$loader->registerNamespace('Flintstones\Rest', __DIR__.'/../src');
-$loader->registerNamespace('Flintstones\Tests\Rest', __DIR__);
-$loader->register();
+$loader = require __DIR__.'/../vendor/autoload.php';
+$loader->add('FlintstonesRest', __DIR__.'/../src');
+$loader->add('Flintstones\Tests\Rest', __DIR__);

0 comments on commit 74ae4fa

Please sign in to comment.