commit bbf42883b6656e42f2500fb9727079af3feb0d2b parent 84a5ec129d9a61e6f9dda034eeede8bbfbdb02d4 Author: Felicitus <felicitus@felicitus.org> Date: Tue, 17 Dec 2013 21:50:52 +0100 Refactored namespace from "model" to "entity", added initial service controller implementation Diffstat:
16 files changed, 602 insertions(+), 499 deletions(-)
diff --git a/app/AppKernel.php b/app/AppKernel.php @@ -54,6 +54,7 @@ class AppKernel extends Kernel new FOS\RestBundle\FOSRestBundle(), new JMS\SerializerBundle\JMSSerializerBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), + new Nelmio\ApiDocBundle\NelmioApiDocBundle(), new PartKeepr\FrontendBundle\PartKeeprFrontendBundle(), diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php @@ -648,6 +648,8 @@ class SymfonyRequirements extends RequirementCollection || (extension_loaded('apc') && ini_get('apc.enabled')) || + (extension_loaded('Zend Optimizer+') && ini_get('zend_optimizerplus.enable')) + || (extension_loaded('Zend OPcache') && ini_get('opcache.enable')) || (extension_loaded('xcache') && ini_get('xcache.cacher')) @@ -661,6 +663,16 @@ class SymfonyRequirements extends RequirementCollection 'Install and enable a <strong>PHP accelerator</strong> like APC (highly recommended).' ); + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + $this->addPhpIniRecommendation( + 'realpath_cache_size', + create_function('$cfgValue', 'return (int) $cfgValue > 1000;'), + false, + 'realpath_cache_size should be above 1024 in php.ini', + 'Set "<strong>realpath_cache_size</strong>" to e.g. "<strong>1024</strong>" in php.ini<a href="#phpini">*</a> to improve performance on windows.' + ); + } + $this->addPhpIniRecommendation('short_open_tag', false); $this->addPhpIniRecommendation('magic_quotes_gpc', false, true); diff --git a/app/config/config.yml b/app/config/config.yml @@ -2,6 +2,26 @@ imports: - { resource: parameters.yml } - { resource: security.yml } +fos_rest: + format_listener: true + param_fetcher_listener: true + view: + default_engine: php + formats: + json: true + xml: true + templating_formats: + html: false + view_response_listener: force + format_listener: + rules: + - { fallback_format: 'json' } + + +sensio_framework_extra: + view: { annotations: false } + router: { annotations: true } + framework: #esi: ~ #translator: { fallback: %locale% } diff --git a/app/config/routing.yml b/app/config/routing.yml @@ -0,0 +1,8 @@ +partkeepr_siprefixbundle: + resource: "@PartKeeprSiPrefixBundle/Controller/" + type: annotation + prefix: / + +NelmioApiDocBundle: + resource: "@NelmioApiDocBundle/Resources/config/routing.yml" + prefix: /api/doc+ \ No newline at end of file diff --git a/composer.json b/composer.json @@ -36,8 +36,9 @@ "sensio/framework-extra-bundle": "~2.3", "sensio/generator-bundle": "~2.3", "incenteev/composer-parameter-handler": "~2.0", - "friendsofsymfony/rest-bundle": "0.13.1", - "jms/serializer-bundle": "0.12.0", + "nelmio/api-doc-bundle": "2.4.3", + "friendsofsymfony/rest-bundle": "1.1.0", + "jms/serializer-bundle": "0.13.0", "cbsi/doctrine2-nestedset": "dev-master", "doctrine/migrations": "dev-master" }, diff --git a/composer.lock b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "30821f9719b5e3666cf0dd8977e77556", + "hash": "600470898c9dfc307c03d3c533fe969a", "packages": [ { "name": "cbsi/doctrine2-nestedset", @@ -11,12 +11,12 @@ "source": { "type": "git", "url": "https://github.com/cbsi/doctrine2-nestedset.git", - "reference": "f49a44e8a0b9bf0ee85db0f8f6fc96bece150713" + "reference": "afdf6fa813b03b1947cc7fdb731b9039e7636ffa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cbsi/doctrine2-nestedset/zipball/f49a44e8a0b9bf0ee85db0f8f6fc96bece150713", - "reference": "f49a44e8a0b9bf0ee85db0f8f6fc96bece150713", + "url": "https://api.github.com/repos/cbsi/doctrine2-nestedset/zipball/afdf6fa813b03b1947cc7fdb731b9039e7636ffa", + "reference": "afdf6fa813b03b1947cc7fdb731b9039e7636ffa", "shasum": "" }, "require": { @@ -53,20 +53,79 @@ "extentions", "nested set" ], - "time": "2012-08-24 21:14:33" + "time": "2013-09-19 20:56:46" + }, + { + "name": "dflydev/markdown", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/dflydev/dflydev-markdown.git", + "reference": "6baed9b50f29c980795b6656d43722aadb126f7e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dflydev/dflydev-markdown/zipball/6baed9b50f29c980795b6656d43722aadb126f7e", + "reference": "6baed9b50f29c980795b6656d43722aadb126f7e", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "dflydev\\markdown": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Dragonfly Development Inc.", + "email": "info@dflydev.com", + "homepage": "http://dflydev.com" + }, + { + "name": "Beau Simensen", + "email": "beau@dflydev.com", + "homepage": "http://beausimensen.com" + }, + { + "name": "Michel Fortin", + "homepage": "http://michelf.com" + }, + { + "name": "John Gruber", + "homepage": "http://daringfireball.net" + } + ], + "description": "PHP Markdown & Extra", + "homepage": "http://github.com/dflydev/dflydev-markdown", + "keywords": [ + "markdown" + ], + "time": "2013-09-23 12:00:18" }, { "name": "doctrine/annotations", - "version": "v1.1.2", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "v1.1.2" + "reference": "97b4a00c5a40c42d8c0b789dabc04b3332c788ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/v1.1.2", - "reference": "v1.1.2", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/97b4a00c5a40c42d8c0b789dabc04b3332c788ab", + "reference": "97b4a00c5a40c42d8c0b789dabc04b3332c788ab", "shasum": "" }, "require": { @@ -79,7 +138,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -95,7 +154,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -111,7 +171,7 @@ "email": "kontakt@beberlei.de" }, { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -124,20 +184,20 @@ "docblock", "parser" ], - "time": "2013-06-16 21:33:03" + "time": "2013-12-13 21:02:36" }, { "name": "doctrine/cache", - "version": "v1.1", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "2c9761ff1d13e188d5f7378066c1ce2882d7a336" + "reference": "ff36d4216fef8242c3d8ee97fceee977e3c9b9a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/2c9761ff1d13e188d5f7378066c1ce2882d7a336", - "reference": "2c9761ff1d13e188d5f7378066c1ce2882d7a336", + "url": "https://api.github.com/repos/doctrine/cache/zipball/ff36d4216fef8242c3d8ee97fceee977e3c9b9a6", + "reference": "ff36d4216fef8242c3d8ee97fceee977e3c9b9a6", "shasum": "" }, "require": { @@ -146,10 +206,14 @@ "conflict": { "doctrine/common": ">2.2,<2.4" }, + "require-dev": { + "phpunit/phpunit": ">=3.7", + "satooshi/php-coveralls": "~0.6" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -163,9 +227,10 @@ ], "authors": [ { - "name": "Jonathan Wage", + "name": "Jonathan H. Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -193,7 +258,7 @@ "cache", "caching" ], - "time": "2013-08-07 16:04:25" + "time": "2013-11-23 16:10:06" }, { "name": "doctrine/collections", @@ -201,12 +266,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "623caf42551b416460df786154d89bc50e3d1798" + "reference": "bcb53776a096a0c64579cc8d8ec0db62f1109fbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/623caf42551b416460df786154d89bc50e3d1798", - "reference": "623caf42551b416460df786154d89bc50e3d1798", + "url": "https://api.github.com/repos/doctrine/collections/zipball/bcb53776a096a0c64579cc8d8ec0db62f1109fbc", + "reference": "bcb53776a096a0c64579cc8d8ec0db62f1109fbc", "shasum": "" }, "require": { @@ -229,9 +294,10 @@ ], "authors": [ { - "name": "Jonathan Wage", + "name": "Jonathan H. Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -247,7 +313,7 @@ "email": "kontakt@beberlei.de" }, { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -260,20 +326,20 @@ "collections", "iterator" ], - "time": "2013-07-23 08:27:26" + "time": "2013-08-29 16:56:45" }, { "name": "doctrine/common", - "version": "dev-master", + "version": "2.4.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "b4c7860e0c5a8d13598ca34d156533300b0dacf0" + "reference": "c94d6ff79e25418b1225e187c782bf4742f23a8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/b4c7860e0c5a8d13598ca34d156533300b0dacf0", - "reference": "b4c7860e0c5a8d13598ca34d156533300b0dacf0", + "url": "https://api.github.com/repos/doctrine/common/zipball/c94d6ff79e25418b1225e187c782bf4742f23a8b", + "reference": "c94d6ff79e25418b1225e187c782bf4742f23a8b", "shasum": "" }, "require": { @@ -303,7 +369,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -334,7 +401,7 @@ "persistence", "spl" ], - "time": "2013-08-20 18:10:31" + "time": "2013-09-07 10:20:35" }, { "name": "doctrine/dbal", @@ -342,16 +409,16 @@ "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "7ffb2701931aeae3bb32fa2012b9a575f3a7929b" + "reference": "390db30f686f3a7ab555178ac22d3f94198e378f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/7ffb2701931aeae3bb32fa2012b9a575f3a7929b", - "reference": "7ffb2701931aeae3bb32fa2012b9a575f3a7929b", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/390db30f686f3a7ab555178ac22d3f94198e378f", + "reference": "390db30f686f3a7ab555178ac22d3f94198e378f", "shasum": "" }, "require": { - "doctrine/common": "2.4.*@beta", + "doctrine/common": "2.4.*", "php": ">=5.3.2" }, "require-dev": { @@ -364,7 +431,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.5.x-dev" } }, "autoload": { @@ -380,7 +447,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -404,7 +472,7 @@ "persistence", "queryobject" ], - "time": "2013-08-24 01:02:33" + "time": "2013-12-13 22:32:11" }, { "name": "doctrine/doctrine-bundle", @@ -413,23 +481,23 @@ "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "b19261fdbc4d8a4697b5373a64f9da5766bbb4db" + "reference": "c65e5a21d1db794511d11fe28918f41bd6072f8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/b19261fdbc4d8a4697b5373a64f9da5766bbb4db", - "reference": "b19261fdbc4d8a4697b5373a64f9da5766bbb4db", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/c65e5a21d1db794511d11fe28918f41bd6072f8f", + "reference": "c65e5a21d1db794511d11fe28918f41bd6072f8f", "shasum": "" }, "require": { - "doctrine/dbal": ">=2.2,<2.5-dev", + "doctrine/dbal": ">=2.2,<2.6-dev", "jdorn/sql-formatter": "~1.1", "php": ">=5.3.2", "symfony/doctrine-bridge": "~2.2", "symfony/framework-bundle": "~2.2" }, "require-dev": { - "doctrine/orm": ">=2.2,<2.5-dev", + "doctrine/orm": "~2.2", "symfony/validator": "~2.2", "symfony/yaml": "~2.2" }, @@ -474,7 +542,7 @@ "orm", "persistence" ], - "time": "2013-08-09 10:00:34" + "time": "2013-11-25 17:33:45" }, { "name": "doctrine/inflector", @@ -550,12 +618,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "bc0e1f0cc285127a38c6c8ea88bc5dba2fd53e94" + "reference": "57d5a024b48709c56ce5bb93072948359220f36c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/bc0e1f0cc285127a38c6c8ea88bc5dba2fd53e94", - "reference": "bc0e1f0cc285127a38c6c8ea88bc5dba2fd53e94", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/57d5a024b48709c56ce5bb93072948359220f36c", + "reference": "57d5a024b48709c56ce5bb93072948359220f36c", "shasum": "" }, "require": { @@ -587,7 +655,7 @@ "email": "roman@code-factory.org" }, { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -599,7 +667,7 @@ "lexer", "parser" ], - "time": "2013-03-07 12:15:25" + "time": "2013-11-19 06:15:26" }, { "name": "doctrine/migrations", @@ -607,16 +675,16 @@ "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "ced3b419252af47f29d6680f9ec74df00ee0c58e" + "reference": "ce2ffa17a642267d48b9df6c5eba94e9d773e22f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/ced3b419252af47f29d6680f9ec74df00ee0c58e", - "reference": "ced3b419252af47f29d6680f9ec74df00ee0c58e", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/ce2ffa17a642267d48b9df6c5eba94e9d773e22f", + "reference": "ce2ffa17a642267d48b9df6c5eba94e9d773e22f", "shasum": "" }, "require": { - "doctrine/dbal": ">=2.0,<2.5.x-dev", + "doctrine/dbal": "~2.0", "php": ">=5.3.2" }, "require-dev": { @@ -627,6 +695,11 @@ "symfony/console": "to run the migration from the console" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-0": { "Doctrine\\DBAL\\Migrations": "lib" @@ -640,7 +713,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Benjamin Eberlei", @@ -653,7 +727,7 @@ "database", "migrations" ], - "time": "2013-06-27 19:46:00" + "time": "2013-12-03 00:28:34" }, { "name": "doctrine/orm", @@ -661,17 +735,17 @@ "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "f634ba343cb0b8524490ba0700f0d19fe85459da" + "reference": "423ea00539d11e9a12e952a7e9144bd2c53019dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/f634ba343cb0b8524490ba0700f0d19fe85459da", - "reference": "f634ba343cb0b8524490ba0700f0d19fe85459da", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/423ea00539d11e9a12e952a7e9144bd2c53019dc", + "reference": "423ea00539d11e9a12e952a7e9144bd2c53019dc", "shasum": "" }, "require": { "doctrine/collections": "~1.1", - "doctrine/dbal": ">=2.4-beta,<2.5-dev", + "doctrine/dbal": ">=2.5-dev,<2.6-dev", "ext-pdo": "*", "php": ">=5.3.2", "symfony/console": "2.*" @@ -690,7 +764,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.5.x-dev" } }, "autoload": { @@ -706,7 +780,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -728,77 +803,25 @@ "database", "orm" ], - "time": "2013-08-25 14:23:20" - }, - { - "name": "friendsofsymfony/rest", - "version": "0.8.0", - "target-dir": "FOS/Rest", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfSymfony/FOSRest.git", - "reference": "0.8.0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRest/zipball/0.8.0", - "reference": "0.8.0", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "symfony/http-foundation": ">=2.0,<3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.8.x-dev" - } - }, - "autoload": { - "psr-0": { - "FOS\\Rest": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Lukas Kahwe Smith", - "email": "smith@pooteeweet.org" - }, - { - "name": "FriendsOfSymfony Community", - "homepage": "https://github.com/FriendsOfSymfony/FOSRest/contributors" - } - ], - "description": "This library provides various tools to develop RESTful API's", - "homepage": "http://friendsofsymfony.github.com", - "keywords": [ - "rest" - ], - "time": "2013-03-02 20:35:05" + "time": "2013-12-17 18:39:36" }, { "name": "friendsofsymfony/rest-bundle", - "version": "0.13.1", + "version": "1.1.0", "target-dir": "FOS/RestBundle", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "0.13.1" + "reference": "e0def4f4f3699f9629f46ca4ed3dbde250d78d96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/0.13.1", - "reference": "0.13.1", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/e0def4f4f3699f9629f46ca4ed3dbde250d78d96", + "reference": "e0def4f4f3699f9629f46ca4ed3dbde250d78d96", "shasum": "" }, "require": { "doctrine/inflector": "1.0.*", - "friendsofsymfony/rest": ">=0.7.0,<0.9.0-dev", "php": ">=5.3.2", "symfony/framework-bundle": "~2.1", "willdurand/negotiation": "1.0.*" @@ -812,17 +835,19 @@ "sensio/framework-extra-bundle": "~2.1", "symfony/form": "~2.1", "symfony/security": "~2.1", + "symfony/serializer": "~2.1", + "symfony/validator": "~2.1", "symfony/yaml": "~2.1" }, "suggest": { "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires 0.12.*", "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener", - "symfony/serializer": "Add support for basic serialization capabilities, requires >=2.0,<2.3-dev" + "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.1" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -854,7 +879,7 @@ "keywords": [ "rest" ], - "time": "2013-08-15 13:30:47" + "time": "2013-11-28 09:03:02" }, { "name": "incenteev/composer-parameter-handler", @@ -863,12 +888,12 @@ "source": { "type": "git", "url": "https://github.com/Incenteev/ParameterHandler.git", - "reference": "548ea586258845b68e8142b0e3f0a7dbac2e6f49" + "reference": "143272a0a09c62616a3c8011fc165a10c6b35241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/548ea586258845b68e8142b0e3f0a7dbac2e6f49", - "reference": "548ea586258845b68e8142b0e3f0a7dbac2e6f49", + "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/143272a0a09c62616a3c8011fc165a10c6b35241", + "reference": "143272a0a09c62616a3c8011fc165a10c6b35241", "shasum": "" }, "require": { @@ -906,7 +931,7 @@ "keywords": [ "parameters management" ], - "time": "2013-08-27 09:48:45" + "time": "2013-12-07 10:10:39" }, { "name": "jdorn/sql-formatter", @@ -914,12 +939,12 @@ "source": { "type": "git", "url": "https://github.com/jdorn/sql-formatter.git", - "reference": "bccca26bfe75b30aba71c2f734e9f9dd854a85f6" + "reference": "8859d664737492d313c34796731b35eca851b362" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/bccca26bfe75b30aba71c2f734e9f9dd854a85f6", - "reference": "bccca26bfe75b30aba71c2f734e9f9dd854a85f6", + "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/8859d664737492d313c34796731b35eca851b362", + "reference": "8859d664737492d313c34796731b35eca851b362", "shasum": "" }, "require": { @@ -956,7 +981,7 @@ "highlight", "sql" ], - "time": "2013-07-11 13:51:14" + "time": "2013-11-27 22:51:13" }, { "name": "jms/metadata", @@ -964,12 +989,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "2b95de3ff995996cf068314bd4299dbfca2ca668" + "reference": "814f758e0e1e37377a03b737a9270a63291c004b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/2b95de3ff995996cf068314bd4299dbfca2ca668", - "reference": "2b95de3ff995996cf068314bd4299dbfca2ca668", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/814f758e0e1e37377a03b737a9270a63291c004b", + "reference": "814f758e0e1e37377a03b737a9270a63291c004b", "shasum": "" }, "require": { @@ -981,7 +1006,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -1008,7 +1033,7 @@ "xml", "yaml" ], - "time": "2013-08-25 08:44:36" + "time": "2013-12-15 13:29:10" }, { "name": "jms/parser-lib", @@ -1051,12 +1076,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "89a43cbe84e079bcd81d82889b03ded9abda2f47" + "reference": "64d99274c2014cadac14406138d785126c10c312" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/89a43cbe84e079bcd81d82889b03ded9abda2f47", - "reference": "89a43cbe84e079bcd81d82889b03ded9abda2f47", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/64d99274c2014cadac14406138d785126c10c312", + "reference": "64d99274c2014cadac14406138d785126c10c312", "shasum": "" }, "require": { @@ -1068,6 +1093,9 @@ }, "require-dev": { "doctrine/orm": ">=2.1,<2.4-dev", + "doctrine/phpcr-odm": "~1.0.1", + "jackalope/jackalope-doctrine-dbal": "1.0.*", + "propel/propel1": "~1.7", "symfony/filesystem": "2.*", "symfony/form": ">=2.1,<2.2-dev", "symfony/translation": ">=2.0,<2.2-dev", @@ -1110,21 +1138,21 @@ "serialization", "xml" ], - "time": "2013-08-17 18:17:07" + "time": "2013-12-16 22:43:38" }, { "name": "jms/serializer-bundle", - "version": "0.12.0", + "version": "0.13.0", "target-dir": "JMS/SerializerBundle", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "0.12.0" + "reference": "bb15db3e661168f4310fad48b86915ff1ca33795" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/0.12.0", - "reference": "0.12.0", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/bb15db3e661168f4310fad48b86915ff1ca33795", + "reference": "bb15db3e661168f4310fad48b86915ff1ca33795", "shasum": "" }, "require": { @@ -1151,7 +1179,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "0.12-dev" + "dev-master": "0.13-dev" } }, "autoload": { @@ -1180,7 +1208,7 @@ "serialization", "xml" ], - "time": "2013-07-29 12:36:36" + "time": "2013-12-05 14:36:11" }, { "name": "kriswallsmith/assetic", @@ -1188,12 +1216,12 @@ "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "f9f754dc7524acd6daf0bf510d22c055b4967e08" + "reference": "5e519fd750ea54a035386562ae03716ffba7014c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/f9f754dc7524acd6daf0bf510d22c055b4967e08", - "reference": "f9f754dc7524acd6daf0bf510d22c055b4967e08", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/5e519fd750ea54a035386562ae03716ffba7014c", + "reference": "5e519fd750ea54a035386562ae03716ffba7014c", "shasum": "" }, "require": { @@ -1251,7 +1279,7 @@ "compression", "minification" ], - "time": "2013-07-11 15:56:23" + "time": "2013-12-14 01:45:39" }, { "name": "monolog/monolog", @@ -1259,12 +1287,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "933f7e26beb19ce15d97031a3fdd21d8bd83a3d3" + "reference": "c9db00f8821b2cc7238732529f8d4007296a630c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/933f7e26beb19ce15d97031a3fdd21d8bd83a3d3", - "reference": "933f7e26beb19ce15d97031a3fdd21d8bd83a3d3", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c9db00f8821b2cc7238732529f8d4007296a630c", + "reference": "c9db00f8821b2cc7238732529f8d4007296a630c", "shasum": "" }, "require": { @@ -1272,21 +1300,26 @@ "psr/log": "~1.0" }, "require-dev": { + "aws/aws-sdk-php": "~2.4.8", "doctrine/couchdb": "dev-master", "mlehner/gelf-php": "1.0.*", - "raven/raven": "0.5.*" + "phpunit/phpunit": "~3.7.0", + "raven/raven": "0.5.*", + "ruflin/elastica": "0.90.*" }, "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server", "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", - "raven/raven": "Allow sending log messages to a Sentry server" + "raven/raven": "Allow sending log messages to a Sentry server", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -1313,7 +1346,82 @@ "logging", "psr-3" ], - "time": "2013-08-26 09:42:58" + "time": "2013-12-14 13:52:08" + }, + { + "name": "nelmio/api-doc-bundle", + "version": "2.4.3", + "target-dir": "Nelmio/ApiDocBundle", + "source": { + "type": "git", + "url": "https://github.com/nelmio/NelmioApiDocBundle.git", + "reference": "21a0774265fbd79d5d145580a2d757c964ce6ab3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/21a0774265fbd79d5d145580a2d757c964ce6ab3", + "reference": "21a0774265fbd79d5d145580a2d757c964ce6ab3", + "shasum": "" + }, + "require": { + "dflydev/markdown": "~1.0", + "symfony/console": "~2.1", + "symfony/framework-bundle": "~2.1", + "symfony/twig-bundle": "~2.1" + }, + "conflict": { + "jms/serializer": "<0.12", + "jms/serializer-bundle": "<0.11" + }, + "require-dev": { + "friendsofsymfony/rest-bundle": "~1.0", + "jms/serializer-bundle": ">=0.11", + "sensio/framework-extra-bundle": "~2.1", + "symfony/browser-kit": "~2.1", + "symfony/css-selector": "~2.1", + "symfony/form": "~2.1", + "symfony/validator": "~2.1", + "symfony/yaml": "~2.1" + }, + "suggest": { + "friendsofsymfony/rest-bundle": "For making use of REST information in the doc.", + "jms/serializer": "For making use of serializer information in the doc.", + "symfony/form": "For using form definitions as input.", + "symfony/validator": "For making use of validator information in the doc." + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Nelmio\\ApiDocBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nelmio", + "homepage": "http://nelm.io" + }, + { + "name": "Symfony Community", + "homepage": "https://github.com/nelmio/NelmioApiDocBundle/contributors" + } + ], + "description": "Generates documentation for your REST API from annotations", + "keywords": [ + "api", + "doc", + "documentation", + "rest" + ], + "time": "2013-12-05 20:36:37" }, { "name": "phpcollection/phpcollection", @@ -1321,12 +1429,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/php-collection.git", - "reference": "5c8ec0d1091c95b973b59a3bf0eb19c5de72d8d1" + "reference": "dbec93115a5ff149b476ee2d4ede3880239a3d77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/5c8ec0d1091c95b973b59a3bf0eb19c5de72d8d1", - "reference": "5c8ec0d1091c95b973b59a3bf0eb19c5de72d8d1", + "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/dbec93115a5ff149b476ee2d4ede3880239a3d77", + "reference": "dbec93115a5ff149b476ee2d4ede3880239a3d77", "shasum": "" }, "require": { @@ -1363,7 +1471,7 @@ "sequence", "set" ], - "time": "2013-08-22 09:46:14" + "time": "2013-12-13 09:27:51" }, { "name": "phpoption/phpoption", @@ -1416,19 +1524,24 @@ }, { "name": "psr/log", - "version": "1.0.0", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/php-fig/log", - "reference": "1.0.0" + "url": "https://github.com/php-fig/log.git", + "reference": "5144da9525d24346bf009ff28f10cbaa1f0f166e" }, "dist": { "type": "zip", - "url": "https://github.com/php-fig/log/archive/1.0.0.zip", - "reference": "1.0.0", + "url": "https://api.github.com/repos/php-fig/log/zipball/5144da9525d24346bf009ff28f10cbaa1f0f166e", + "reference": "5144da9525d24346bf009ff28f10cbaa1f0f166e", "shasum": "" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-0": { "Psr\\Log\\": "" @@ -1450,7 +1563,7 @@ "psr", "psr-3" ], - "time": "2012-12-21 11:40:51" + "time": "2013-12-05 15:25:07" }, { "name": "sensio/distribution-bundle", @@ -1459,12 +1572,12 @@ "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "66df91b4bd637a83299d8072aed3658bfd3b3021" + "reference": "cf0179711b24d84d4a29d71a4010540f4c990bd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/66df91b4bd637a83299d8072aed3658bfd3b3021", - "reference": "66df91b4bd637a83299d8072aed3658bfd3b3021", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/cf0179711b24d84d4a29d71a4010540f4c990bd8", + "reference": "cf0179711b24d84d4a29d71a4010540f4c990bd8", "shasum": "" }, "require": { @@ -1496,21 +1609,21 @@ "configuration", "distribution" ], - "time": "2013-08-22 05:04:53" + "time": "2013-12-16 06:18:38" }, { "name": "sensio/framework-extra-bundle", - "version": "dev-master", + "version": "2.3.x-dev", "target-dir": "Sensio/Bundle/FrameworkExtraBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "cce05719041d952bbec856789ca18646a1891d03" + "reference": "62e45cd2d4eb5e50265fe0329d59ef8a2163e500" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/cce05719041d952bbec856789ca18646a1891d03", - "reference": "cce05719041d952bbec856789ca18646a1891d03", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/62e45cd2d4eb5e50265fe0329d59ef8a2163e500", + "reference": "62e45cd2d4eb5e50265fe0329d59ef8a2163e500", "shasum": "" }, "require": { @@ -1543,7 +1656,7 @@ "annotations", "controllers" ], - "time": "2013-07-24 08:49:53" + "time": "2013-12-12 11:16:36" }, { "name": "sensio/generator-bundle", @@ -1552,12 +1665,12 @@ "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "4a7b126e9c22f858e3584b19ddce6e5bdd7677ee" + "reference": "38cce07d6b27d8ac2b6000560309f0cd5ce63577" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/4a7b126e9c22f858e3584b19ddce6e5bdd7677ee", - "reference": "4a7b126e9c22f858e3584b19ddce6e5bdd7677ee", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/38cce07d6b27d8ac2b6000560309f0cd5ce63577", + "reference": "38cce07d6b27d8ac2b6000560309f0cd5ce63577", "shasum": "" }, "require": { @@ -1591,20 +1704,20 @@ } ], "description": "This bundle generates code for you", - "time": "2013-08-21 18:09:35" + "time": "2013-11-25 20:47:16" }, { "name": "swiftmailer/swiftmailer", - "version": "v5.0.1", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "v5.0.1" + "reference": "32edc3b0de0fdc1b10f5c4912e8677b3f411a230" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/v5.0.1", - "reference": "v5.0.1", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/32edc3b0de0fdc1b10f5c4912e8677b3f411a230", + "reference": "32edc3b0de0fdc1b10f5c4912e8677b3f411a230", "shasum": "" }, "require": { @@ -1640,7 +1753,7 @@ "mail", "mailer" ], - "time": "2013-06-17 13:32:32" + "time": "2013-12-03 13:33:24" }, { "name": "symfony/assetic-bundle", @@ -1649,12 +1762,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/AsseticBundle.git", - "reference": "bc213d871f8c085c48ea00cb26eb91e1f260b5a7" + "reference": "82d5431a14cc7ec9ef3a1fcb3b452ac39d749831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/bc213d871f8c085c48ea00cb26eb91e1f260b5a7", - "reference": "bc213d871f8c085c48ea00cb26eb91e1f260b5a7", + "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/82d5431a14cc7ec9ef3a1fcb3b452ac39d749831", + "reference": "82d5431a14cc7ec9ef3a1fcb3b452ac39d749831", "shasum": "" }, "require": { @@ -1672,6 +1785,7 @@ "symfony/yaml": "~2.1" }, "suggest": { + "kriswallsmith/spork": "v0.2", "symfony/twig-bundle": "~2.1" }, "type": "symfony-bundle", @@ -1703,7 +1817,7 @@ "compression", "minification" ], - "time": "2013-07-15 14:44:32" + "time": "2013-12-04 10:40:40" }, { "name": "symfony/icu", @@ -1712,12 +1826,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Icu.git", - "reference": "45c8d35427304b1e14a13a03426055f501ba5f61" + "reference": "98e197da54df1f966dd5e8a4992135703569c987" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Icu/zipball/45c8d35427304b1e14a13a03426055f501ba5f61", - "reference": "45c8d35427304b1e14a13a03426055f501ba5f61", + "url": "https://api.github.com/repos/symfony/Icu/zipball/98e197da54df1f966dd5e8a4992135703569c987", + "reference": "98e197da54df1f966dd5e8a4992135703569c987", "shasum": "" }, "require": { @@ -1751,7 +1865,7 @@ "icu", "intl" ], - "time": "2013-08-06 12:55:36" + "time": "2013-10-04 10:06:38" }, { "name": "symfony/monolog-bundle", @@ -1760,12 +1874,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/MonologBundle.git", - "reference": "e81c2e9c4dc0a9ff794674017069e036f575f278" + "reference": "fc178515164e05099f618025c842abfa79313cad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/e81c2e9c4dc0a9ff794674017069e036f575f278", - "reference": "e81c2e9c4dc0a9ff794674017069e036f575f278", + "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/fc178515164e05099f618025c842abfa79313cad", + "reference": "fc178515164e05099f618025c842abfa79313cad", "shasum": "" }, "require": { @@ -1811,7 +1925,7 @@ "log", "logging" ], - "time": "2013-08-26 10:15:04" + "time": "2013-11-23 10:14:37" }, { "name": "symfony/swiftmailer-bundle", @@ -1874,12 +1988,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "32947b2fc8c199b7aab4475473136ed651c097a0" + "reference": "67ae8fab191eb808787ae9e6aac1470b4298dd86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/32947b2fc8c199b7aab4475473136ed651c097a0", - "reference": "32947b2fc8c199b7aab4475473136ed651c097a0", + "url": "https://api.github.com/repos/symfony/symfony/zipball/67ae8fab191eb808787ae9e6aac1470b4298dd86", + "reference": "67ae8fab191eb808787ae9e6aac1470b4298dd86", "shasum": "" }, "require": { @@ -1900,6 +2014,7 @@ "symfony/doctrine-bridge": "self.version", "symfony/dom-crawler": "self.version", "symfony/event-dispatcher": "self.version", + "symfony/expression-language": "self.version", "symfony/filesystem": "self.version", "symfony/finder": "self.version", "symfony/form": "self.version", @@ -1916,7 +2031,11 @@ "symfony/proxy-manager-bridge": "self.version", "symfony/routing": "self.version", "symfony/security": "self.version", + "symfony/security-acl": "self.version", "symfony/security-bundle": "self.version", + "symfony/security-core": "self.version", + "symfony/security-csrf": "self.version", + "symfony/security-http": "self.version", "symfony/serializer": "self.version", "symfony/stopwatch": "self.version", "symfony/swiftmailer-bridge": "self.version", @@ -1940,7 +2059,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "2.5-dev" } }, "autoload": { @@ -1974,7 +2093,7 @@ "keywords": [ "framework" ], - "time": "2013-08-25 08:03:30" + "time": "2013-12-17 12:58:30" }, { "name": "twig/extensions", @@ -1982,12 +2101,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Twig-extensions.git", - "reference": "f5b0c84f3699e494c84ee627d7d583e115d2c4a2" + "reference": "0fdc8ca874d415b65c7a0d31376cac9c9ed775af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/f5b0c84f3699e494c84ee627d7d583e115d2c4a2", - "reference": "f5b0c84f3699e494c84ee627d7d583e115d2c4a2", + "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/0fdc8ca874d415b65c7a0d31376cac9c9ed775af", + "reference": "0fdc8ca874d415b65c7a0d31376cac9c9ed775af", "shasum": "" }, "require": { @@ -2021,7 +2140,7 @@ "i18n", "text" ], - "time": "2013-07-02 11:21:55" + "time": "2013-11-27 18:19:39" }, { "name": "twig/twig", @@ -2029,12 +2148,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "cacbf201af1500852f83ad9c5d389a13d52f654e" + "reference": "6387fc457792f38189bdd5729b500772bbddfa4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/cacbf201af1500852f83ad9c5d389a13d52f654e", - "reference": "cacbf201af1500852f83ad9c5d389a13d52f654e", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/6387fc457792f38189bdd5729b500772bbddfa4d", + "reference": "6387fc457792f38189bdd5729b500772bbddfa4d", "shasum": "" }, "require": { @@ -2043,7 +2162,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -2070,20 +2189,20 @@ "keywords": [ "templating" ], - "time": "2013-08-26 08:23:34" + "time": "2013-12-10 10:23:00" }, { "name": "willdurand/negotiation", - "version": "dev-master", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/willdurand/Negotiation.git", - "reference": "a25b58fd5d6cabcd515bc83661788582b0bcf3f8" + "reference": "366e31cfc247946dfe8c622bc00041964e9b294f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/a25b58fd5d6cabcd515bc83661788582b0bcf3f8", - "reference": "a25b58fd5d6cabcd515bc83661788582b0bcf3f8", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/366e31cfc247946dfe8c622bc00041964e9b294f", + "reference": "366e31cfc247946dfe8c622bc00041964e9b294f", "shasum": "" }, "require": { @@ -2120,7 +2239,7 @@ "header", "negotiation" ], - "time": "2013-08-06 14:47:08" + "time": "2013-11-26 14:42:16" } ], "packages-dev": [ diff --git a/src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php b/src/PartKeepr/SiPrefixBundle/Entity/SiPrefix.php @@ -0,0 +1,168 @@ +<?php +namespace PartKeepr\SiPrefixBundle\Entity; + +use PartKeepr\Util\BaseEntity, + Doctrine\ORM\Mapping as ORM, + Symfony\Component\Validator\Constraints as Assert; + +/** + * Represents an SI Prefix + * + * @link http://en.wikipedia.org/wiki/Metric_prefix + * + * @ORM\Entity + */ +class SiPrefix extends BaseEntity +{ + /** + * The prefix of the Si-Prefix (e.g. yotta, deca, deci, centi) + * + * @ORM\Column(type="string") + * + * @Assert\Type(type="string") + * @Assert\NotBlank(message="siprefix.prefix.not_blank") + * + * @var string + */ + private $prefix; + + /** + * The symbol of the Si-Prefix (e.g. m, M, G) + * + * @ORM\Column(type="string",length=2) + * + * @Assert\Type(type="string") + * @Assert\NotBlank(message="siprefix.symbol.not_blank") + * + * @var string + */ + private $symbol; + + /** + * The exponent of the Si-Prefix (e.g. milli = 10^-3) + * + * @ORM\Column(type="integer") + * @Assert\Type(type="integer") + * + * @var int + */ + private $exponent; + + /** + * The base of the Si-Prefix (e.g. 2^-3) + * + * @ORM\Column(type="integer") + * @Assert\Type(type="integer") + * + * @var int + */ + private $base; + + /** + * Sets the prefix name. + * + * @param string $prefix + */ + public function setPrefix($prefix) + { + $this->prefix = $prefix; + } + + /** + * Returns the prefix name + * + * + * @return string The prefix name + */ + public function getPrefix() + { + return $this->prefix; + } + + /** + * Sets the symbol for the prefix + * + * @param string $symbol The symbol + */ + public function setSymbol($symbol) + { + $this->symbol = $symbol; + } + + /** + * Returns the symbol for the prefix + * + * @return string The symbol + */ + public function getSymbol() + { + return $this->symbol; + } + + /** + * Sets the exponent + * + * @param int $exponent The exponent + */ + public function setExponent($exponent) + { + $this->exponent = $exponent; + } + + /** + * Returns the exponent + * + * @return int The exponent + */ + public function getExponent() + { + return $this->exponent; + } + + /** + * Sets the base + * + * @param int $base The base + */ + public function setBase($base) + { + $this->base = $base; + } + + /** + * Returns the base + * + * @return int The base + */ + public function getBase() + { + return $this->base; + } + + /** + * Calculates the product for a given value + * + * @param $value float The value to calculate the product + * + * @return float The resulting value + */ + public function calculateProduct($value) + { + return $value * pow($this->base, $this->exponent); + } + + /** + * Serializes the object into an array format. + * + * @return array the object in serialized format. + */ + public function serialize() + { + return array( + "id" => $this->getId(), + "symbol" => $this->getSymbol(), + "prefix" => $this->getPrefix(), + "exponent" => $this->getExponent() + ); + } +}+ \ No newline at end of file diff --git a/src/PartKeepr/SiPrefixBundle/Model/SiPrefix.php b/src/PartKeepr/SiPrefixBundle/Model/SiPrefix.php @@ -1,168 +0,0 @@ -<?php -namespace PartKeepr\SiPrefixBundle\Model; - -use PartKeepr\Util\BaseEntity, - Doctrine\ORM\Mapping as ORM, - Symfony\Component\Validator\Constraints as Assert; - -/** - * Represents an SI Prefix - * - * @link http://en.wikipedia.org/wiki/Metric_prefix - * - * @ORM\Entity - */ -class SiPrefix extends BaseEntity -{ - /** - * The prefix of the Si-Prefix (e.g. yotta, deca, deci, centi) - * - * @ORM\Column(type="string") - * - * @Assert\Type(type="string") - * @Assert\NotBlank(message="siprefix.prefix.not_blank") - * - * @var string - */ - private $prefix; - - /** - * The symbol of the Si-Prefix (e.g. m, M, G) - * - * @ORM\Column(type="string",length=2) - * - * @Assert\Type(type="string") - * @Assert\NotBlank(message="siprefix.symbol.not_blank") - * - * @var string - */ - private $symbol; - - /** - * The exponent of the Si-Prefix (e.g. milli = 10^-3) - * - * @ORM\Column(type="integer") - * @Assert\Type(type="integer") - * - * @var int - */ - private $exponent; - - /** - * The base of the Si-Prefix (e.g. 2^-3) - * - * @ORM\Column(type="integer") - * @Assert\Type(type="integer") - * - * @var int - */ - private $base; - - /** - * Sets the prefix name. - * - * @param string $prefix - */ - public function setPrefix($prefix) - { - $this->prefix = $prefix; - } - - /** - * Returns the prefix name - * - * - * @return string The prefix name - */ - public function getPrefix() - { - return $this->prefix; - } - - /** - * Sets the symbol for the prefix - * - * @param string $symbol The symbol - */ - public function setSymbol($symbol) - { - $this->symbol = $symbol; - } - - /** - * Returns the symbol for the prefix - * - * @return string The symbol - */ - public function getSymbol() - { - return $this->symbol; - } - - /** - * Sets the exponent - * - * @param int $exponent The exponent - */ - public function setExponent($exponent) - { - $this->exponent = $exponent; - } - - /** - * Returns the exponent - * - * @return int The exponent - */ - public function getExponent() - { - return $this->exponent; - } - - /** - * Sets the base - * - * @param int $base The base - */ - public function setBase($base) - { - $this->base = $base; - } - - /** - * Returns the base - * - * @return int The base - */ - public function getBase() - { - return $this->base; - } - - /** - * Calculates the product for a given value - * - * @param $value float The value to calculate the product - * - * @return float The resulting value - */ - public function calculateProduct($value) - { - return $value * pow($this->base, $this->exponent); - } - - /** - * Serializes the object into an array format. - * - * @return array the object in serialized format. - */ - public function serialize() - { - return array( - "id" => $this->getId(), - "symbol" => $this->getSymbol(), - "prefix" => $this->getPrefix(), - "exponent" => $this->getExponent() - ); - } -}- \ No newline at end of file diff --git a/src/PartKeepr/SiPrefixBundle/Tests/Model/SiPrefixTest.php b/src/PartKeepr/SiPrefixBundle/Tests/Model/SiPrefixTest.php @@ -1,7 +1,7 @@ <?php namespace PartKeepr\SiPrefixBundle\Tests\Model; -use PartKeepr\SiPrefixBundle\Model\SiPrefix; +use PartKeepr\SiPrefixBundle\Entity\SiPrefix; class SiPrefixTest extends \PHPUnit_Framework_TestCase { diff --git a/src/backend/PartKeepr/Part/PartManager.php b/src/backend/PartKeepr/Part/PartManager.php @@ -9,7 +9,7 @@ use PartKeepr\UploadedFile\TempUploadedFile, PartKeepr\PartParameter\PartParameter, PartKeepr\Manager\AbstractManager, PartKeepr\Unit\Unit, - PartKeepr\SiPrefixBundle\Model\SiPrefix, + PartKeepr\SiPrefixBundle\Entity\SiPrefix, PartKeepr\Part\PartDistributor, PartKeepr\Part\PartManufacturer, PartKeepr\StorageLocation\StorageLocation, diff --git a/src/backend/PartKeepr/PartParameter/PartParameter.php b/src/backend/PartKeepr/PartParameter/PartParameter.php @@ -5,7 +5,7 @@ use PartKeepr\PartKeepr, PartKeepr\Util\Exceptions\OutOfRangeException, PartKeepr\Unit\Unit, PartKeepr\Part\Part, -PartKeepr\SiPrefixBundle\Model\SiPrefix, +PartKeepr\SiPrefixBundle\Entity\SiPrefix, Doctrine\ORM\Mapping as ORM; @@ -64,7 +64,7 @@ class PartParameter { /** * The SiPrefix of the unit - * @ORM\ManyToOne(targetEntity="PartKeepr\SiPrefixBundle\Model\SiPrefix") + * @ORM\ManyToOne(targetEntity="PartKeepr\SiPrefixBundle\Entity\SiPrefix") * @var object */ private $siPrefix; @@ -160,7 +160,8 @@ class PartParameter { /** * Sets the si prefix for this parameter - * @param SiPrefix $prefix The prefix to set, or null + * +*@param \PartKeepr\SiPrefixBundle\Entity\SiPrefix $prefix The prefix to set, or null */ public function setSiPrefix (SiPrefix $prefix = null) { $this->siPrefix = $prefix; @@ -170,7 +171,8 @@ class PartParameter { /** * Returns the si prefix for this parameter - * @return SiPrefix the si prefix or null + * +*@return \PartKeepr\SiPrefixBundle\Entity\SiPrefix the si prefix or null */ public function getSiPrefix () { return $this->siPrefix; diff --git a/src/backend/PartKeepr/Setup/SiPrefixSetup.php b/src/backend/PartKeepr/Setup/SiPrefixSetup.php @@ -2,7 +2,7 @@ namespace PartKeepr\Setup; use PartKeepr\PartKeepr, - PartKeepr\SiPrefixBundle\Model\SiPrefix, + PartKeepr\SiPrefixBundle\Entity\SiPrefix, PartKeepr\SiPrefixBundle\Model\SiPrefixManager; class SiPrefixSetup extends AbstractSetup { diff --git a/src/backend/PartKeepr/SiPrefix/SiPrefixManager.php b/src/backend/PartKeepr/SiPrefix/SiPrefixManager.php @@ -1,12 +1,44 @@ <?php namespace PartKeepr\SiPrefix; +use PartKeepr\Manager\AbstractManager; use PartKeepr\Util\Singleton, PartKeepr\PartKeepr; -class SiPrefixManager extends Singleton { +class SiPrefixManager extends AbstractManager { + /** + * Returns the FQCN for the target entity to operate on. + * + * @return string The FQCN, e.g. PartKeepr\Part + */ + public function getEntityName() + { + return 'PartKeepr\SiPrefixBundle\Entity\SiPrefix'; + } + + /** + * Returns all fields which need to appear in the getList ResultSet. + * + * @return array An array of all fields which should be returned + */ + public function getQueryFields() + { + return array("id", "symbol", "base", "exponent", "base"); + } + + /** + * Returns the default sort field + * + * @return string The default sort field + */ + public function getDefaultSortField() + { + return "symbol"; + } + public $siPrefixSymbolCache = array(); - + + // @todo fix legacy stuff below public function getSiPrefixBySymbol ($symbol) { if (!is_array($this->siPrefixSymbolCache) || count($this->siPrefixSymbolCache) == 0) { $this->createSiPrefixSymbolCache(); @@ -22,14 +54,14 @@ class SiPrefixManager extends Singleton { } private function createSiPrefixSymbolCache () { - $dql = "SELECT sip FROM PartKeepr\SiPrefixBundle\Model\SiPrefix sip"; + $dql = "SELECT sip FROM PartKeepr\SiPrefixBundle\Entity\SiPrefix sip"; $query = PartKeepr::getEM()->createQuery($dql); $this->siPrefixSymbolCache = $query->getResult(); } public function siPrefixExists ($prefix) { - $dql = "SELECT COUNT(sip) FROM PartKeepr\SiPrefixBundle\Model\SiPrefix sip WHERE sip.prefix = :prefix"; + $dql = "SELECT COUNT(sip) FROM PartKeepr\SiPrefixBundle\Entity\SiPrefix sip WHERE sip.prefix = :prefix"; $query = PartKeepr::getEM()->createQuery($dql); $query->setParameter("prefix", $prefix); diff --git a/src/backend/PartKeepr/Unit/Unit.php b/src/backend/PartKeepr/Unit/Unit.php @@ -6,7 +6,7 @@ use PartKeepr\Util\Deserializable, PartKeepr\Util\BaseEntity, PartKeepr\PartKeepr, PartKeepr\Util\Exceptions\OutOfRangeException, - PartKeepr\SiPrefixBundle\Model\SiPrefix, + PartKeepr\SiPrefixBundle\Entity\SiPrefix, Doctrine\ORM\Mapping as ORM; @@ -32,7 +32,7 @@ class Unit extends BaseEntity implements Serializable, Deserializable { /** * Defines the allowed SiPrefixes for this parameter unit - * @ORM\ManyToMany(targetEntity="PartKeepr\SiPrefixBundle\Model\SiPrefix") + * @ORM\ManyToMany(targetEntity="PartKeepr\SiPrefixBundle\Entity\SiPrefix") * @ORM\JoinTable(name="UnitSiPrefixes", * joinColumns={@ORM\JoinColumn(name="unit_id", referencedColumnName="id")}, * inverseJoinColumns={@ORM\JoinColumn(name="siprefix_id", referencedColumnName="id")} diff --git a/src/backend/PartKeepr/Unit/UnitService.php b/src/backend/PartKeepr/Unit/UnitService.php @@ -5,7 +5,7 @@ use PartKeepr\Service\RestfulService, PartKeepr\Service\Service, PartKeepr\PartKeepr, PartKeepr\Part\PartUnit, - PartKeepr\SiPrefixBundle\Model\SiPrefix, + PartKeepr\SiPrefixBundle\Entity\SiPrefix, PartKeepr\Session\SessionManager; class UnitService extends Service implements RestfulService { diff --git a/src/frontend/index.php b/src/frontend/index.php @@ -19,99 +19,7 @@ require_once __DIR__.'/../app/AppKernel.php'; $kernel = new \AppKernel('dev', false); $kernel->loadClassCache(); -PartKeepr::initialize(""); - -/* Fill parameters with most common options */ -$aParameters = array(); -$aParameters["doctrine_orm_version"] = \Doctrine\ORM\Version::VERSION; -$aParameters["doctrine_dbal_version"] = \Doctrine\DBAL\Version::VERSION; -$aParameters["doctrine_common_version"] = \Doctrine\Common\Version::VERSION; -$aParameters["php_version"] = phpversion(); - -/* HTTP auth */ -if (Configuration::getOption("partkeepr.auth.http", false) === true) { - if (!isset($_SERVER["PHP_AUTH_USER"])) { - // @todo Redirect to permission denied page - die("Permission denied"); - } - - try { - $user = User::loadByName($_SERVER['PHP_AUTH_USER']); - } catch (\Doctrine\ORM\NoResultException $e) { - $user = new User; - $user->setUsername($_SERVER['PHP_AUTH_USER']); - $user->setPassword("invalid"); - - PartKeepr::getEM()->persist($user); - PartKeepr::getEM()->flush(); - } - - - $session = SessionManager::getInstance()->startSession($user); - - $aParameters["autoLoginUsername"] = $user->getUsername(); - $aParameters["auto_start_session"] = $session->getSessionID(); - - $aPreferences = array(); - - foreach ($user->getPreferences() as $result) { - $aPreferences[] = $result->serialize(); - } - - $aParameters["userPreferences"] = array("response" => array("data" => $aPreferences)); -} - -\Twig_Autoloader::register(); - -$loader = new \Twig_Loader_Filesystem(dirname(__FILE__) . '/templates/'); -$twig = new \Twig_Environment($loader); - - -/* Information about maximum upload sizes */ -$maxPostSize = PartKeepr::getBytesFromHumanReadable(ini_get("post_max_size")); -$maxFileSize = PartKeepr::getBytesFromHumanReadable(ini_get("upload_max_filesize")); - -$aParameters["maxUploadSize"] = min($maxPostSize, $maxFileSize); - -if (!class_exists("Imagick")) { - $template = $twig->loadTemplate("error.tpl"); - echo $template->render(array( - "title" => PartKeepr::i18n("ImageMagick is not installed"), - "error" => PartKeepr::i18n("You are missing the ImageMagick extension. Please install it and restart the setup to verify that the library was installed correctly.") - )); - exit; -} - -/* ImageMagick formats */ -$imagick = new \Imagick(); -$aParameters["availableImageFormats"] = $imagick->queryFormats(); - -/* Automatic Login */ -if (Configuration::getOption("partkeepr.frontend.autologin.enabled", false) === true) { - $aParameters["autoLoginUsername"] = Configuration::getOption("partkeepr.frontend.autologin.username"); - $aParameters["autoLoginPassword"] = Configuration::getOption("partkeepr.frontend.autologin.password"); -} - -if (Configuration::getOption("partkeepr.frontend.motd", false) !== false) { - $aParameters["motd"] = Configuration::getOption("partkeepr.frontend.motd"); -} - -/* Load and render the template */ -$template = $twig->loadTemplate("index.tpl"); - -$renderParams = array(); -$renderParams["debug_all"] = Configuration::getOption("partkeepr.frontend.debug_all", false); -$renderParams["debug"] = Configuration::getOption("partkeepr.frontend.debug", false); -$renderParams["parameters"] = $aParameters; - -if ($renderParams["debug_all"]) { - $renderParams["scripts"] = unserialize(file_get_contents(PartKeepr::getRootDirectory() . "/partkeepr.jsfiles")); -} - -if (isset($_SERVER['HTTPS'])) { - $renderParams["https"] = true; -} else { - $renderParams["https"] = false; -} - -echo $template->render($renderParams);- \ No newline at end of file +$request = Request::createFromGlobals(); +$response = $kernel->handle($request); +$response->send(); +$kernel->terminate($request, $response);