From b772951ebedf105daf118bde8d53800743cab757 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sat, 26 Jan 2013 03:58:36 +0000 Subject: [PATCH 1/5] Add composer.lock to .gitignore --- .gitignore | 3 +- composer.lock | 235 -------------------------------------------------- 2 files changed, 2 insertions(+), 236 deletions(-) delete mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index 22d0d82..de4a392 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -vendor +/vendor +/composer.lock diff --git a/composer.lock b/composer.lock deleted file mode 100644 index e232ffc..0000000 --- a/composer.lock +++ /dev/null @@ -1,235 +0,0 @@ -{ - "hash": "fbaad4ca06268918d11410b6f0e70525", - "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", - "alias-pretty-version": "0.8.x-dev", - "alias-version": "0.8.9999999.9999999-dev" - }, - { - "package": "friendsofsymfony/rest-bundle", - "version": "dev-master", - "source-reference": "d3f15d6c913d25fe5b29185e6e6be510afd09c73", - "commit-date": "1345237156" - }, - { - "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": "7c58d49ff13de62464837c3c7d91aff1deb2c442", - "commit-date": "1345552810" - }, - { - "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": "f68ad44f3ee1603ce96387bacba0ecba488c2a33", - "commit-date": "1344599303" - }, - { - "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": "98fa735a7ef5dc07c43bfe6faa4367a983b6ba6f", - "commit-date": "1344599303" - }, - { - "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": "76c76f62702b09e0f182ae618be0f1d79e2a711f", - "commit-date": "1345066712" - }, - { - "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": "72acf65c2390c9066e1174d269a4e146ffad9296", - "commit-date": "1344875591" - }, - { - "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": "4f0d296b4414cb5322e7ee45af117e5234bc75d0", - "commit-date": "1345278333" - }, - { - "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": "8d5e7f909fa519853e71bcfc57a1da8c637ebcbb", - "commit-date": "1345191498" - }, - { - "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": "d7a6083e76a3af3f247bff523bc47b41e7208a87", - "commit-date": "1344955085" - } - ], - "packages-dev": null, - "aliases": [ - - ], - "minimum-stability": "dev", - "stability-flags": [ - - ] -} From 00eccbcacdc091af79038911fe72e2a50d05e995 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sat, 26 Jan 2013 04:02:35 +0000 Subject: [PATCH 2/5] Cleanup: Remove old autoloader code --- README.md | 5 +---- src/Flintstones/Rest/ServiceProvider.php | 8 -------- tests/Flintstones/Rest/Tests/ServiceProviderTest.php | 5 +---- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index d502f5f..4708bdc 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,7 @@ You get accept header support and request body decoding. ## Registering - $app->register(new Flintstones\Rest\ServiceProvider(), array( - 'rest.fos.class_path' => __DIR__.'/vendor', - 'rest.serializer.class_path' => __DIR__.'/vendor', - )); + $app->register(new Flintstones\Rest\ServiceProvider()); ## Running the tests diff --git a/src/Flintstones/Rest/ServiceProvider.php b/src/Flintstones/Rest/ServiceProvider.php index 8468619..e3fea2b 100644 --- a/src/Flintstones/Rest/ServiceProvider.php +++ b/src/Flintstones/Rest/ServiceProvider.php @@ -59,14 +59,6 @@ public function register(Application $app) 'xml' => 'rest.decoder.xml', ); - if (isset($app['rest.fos.class_path'])) { - $app['autoloader']->registerNamespace('FOS\RestBundle', $app['rest.fos.class_path']); - } - - if (isset($app['rest.serializer.class_path'])) { - $app['autoloader']->registerNamespace('Symfony\Component\Serializer', $app['rest.serializer.class_path']); - } - $listener = new BodyListener(new PimpleDecoderProvider($app, $app['rest.decoders'])); $app['dispatcher']->addListener(HttpKernelEvents::REQUEST, array($listener, 'onKernelRequest')); diff --git a/tests/Flintstones/Rest/Tests/ServiceProviderTest.php b/tests/Flintstones/Rest/Tests/ServiceProviderTest.php index b087cc4..8452f72 100644 --- a/tests/Flintstones/Rest/Tests/ServiceProviderTest.php +++ b/tests/Flintstones/Rest/Tests/ServiceProviderTest.php @@ -36,10 +36,7 @@ public function testRegister() { $app = new Application(); - $app->register(new RestServiceProvider(), array( - 'rest.fos.class_path' => __DIR__.'/../../../../vendor', - 'rest.serializer.class_path' => __DIR__.'/../../../../vendor', - )); + $app->register(new RestServiceProvider()); $this->assertInstanceOf('Symfony\Component\Serializer\Serializer', $app['rest.serializer']); From 160c7189e1d3c3d419b8e3ede1d364b279297fd1 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sat, 26 Jan 2013 04:03:13 +0000 Subject: [PATCH 3/5] Cleanup: Remove unnecessary and unused parameters for FormatNegotiator() --- src/Flintstones/Rest/ServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Flintstones/Rest/ServiceProvider.php b/src/Flintstones/Rest/ServiceProvider.php index e3fea2b..33397c0 100644 --- a/src/Flintstones/Rest/ServiceProvider.php +++ b/src/Flintstones/Rest/ServiceProvider.php @@ -43,7 +43,7 @@ public function register(Application $app) } $app['rest.format_negotiator'] = function ($app) { - return new FormatNegotiator($app['request'], $app['rest.priorities']); + return new FormatNegotiator(); }; $app['rest.decoder.json'] = function ($app) { From 4b699f58ca256b89dde4522806b6e00bf56c7021 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sat, 26 Jan 2013 04:04:37 +0000 Subject: [PATCH 4/5] Cleanup: Fix indentation and remove unnecessary comments around boot() method, inline with (most) service providers included in Silex --- src/Flintstones/Rest/ServiceProvider.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/Flintstones/Rest/ServiceProvider.php b/src/Flintstones/Rest/ServiceProvider.php index 33397c0..dabc605 100644 --- a/src/Flintstones/Rest/ServiceProvider.php +++ b/src/Flintstones/Rest/ServiceProvider.php @@ -65,15 +65,7 @@ public function register(Application $app) $listener = new FormatListener($app['rest.format_negotiator'], 'html', $app['rest.priorities']); $app['dispatcher']->addListener(HttpKernelEvents::CONTROLLER, array($listener, 'onKernelController'), 10); } - - /** - * Bootstraps the application. - * - * This method is called after all services are registers - * and should be used for "dynamic" configuration (whenever - * a service must be requested). - */ - public function boot(Application $app) { - // TODO: Implement boot() method. - } + + public function boot(Application $app) { + } } From bbc0b4384738ffbb1547becae30d671c4966eb10 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sun, 27 Jan 2013 23:07:46 +0000 Subject: [PATCH 5/5] Fix method bracket placement --- src/Flintstones/Rest/ServiceProvider.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Flintstones/Rest/ServiceProvider.php b/src/Flintstones/Rest/ServiceProvider.php index dabc605..06a3729 100644 --- a/src/Flintstones/Rest/ServiceProvider.php +++ b/src/Flintstones/Rest/ServiceProvider.php @@ -66,6 +66,7 @@ public function register(Application $app) $app['dispatcher']->addListener(HttpKernelEvents::CONTROLLER, array($listener, 'onKernelController'), 10); } - public function boot(Application $app) { + public function boot(Application $app) + { } }