diff --git a/.gitignore b/.gitignore index 8fdafe1..2b38de6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ web/bundles/* app/config/parameters.ini # Composer related files -composer.lock vendor/composer/installed.json # Assetic-generated .js and .css files diff --git a/composer.json b/composer.json index f6a569a..d453570 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "repositories": [ { "type": "vcs", - "url": "https://github.com/w00d5t0ck/IoTcpdfBundle" + "url": "https://github.com/gergelypolonkai/IoTcpdfBundle" } ], "require": { @@ -45,9 +45,6 @@ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ] }, - "config": { - "bin-dir": "bin" - }, "minimum-stability": "dev", "extra": { "symfony-app-dir": "app", diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..c1f744e --- /dev/null +++ b/composer.lock @@ -0,0 +1,1726 @@ +{ + "hash": "24c1ca205ff02cf57382f6c099d64465", + "packages": [ + { + "name": "doctrine/common", + "version": "2.3.x-dev", + "source": { + "type": "git", + "url": "https://github.com/doctrine/common", + "reference": "bb0aebbf234db52df476a2b473d434745b34221c" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/common/zipball/bb0aebbf234db52df476a2b473d434745b34221c", + "reference": "bb0aebbf234db52df476a2b473d434745b34221c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "time": "1348120518", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\Common": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common Library for Doctrine projects", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "collections", + "spl", + "eventmanager", + "annotations", + "persistence" + ] + }, + { + "name": "doctrine/dbal", + "version": "2.3.x-dev", + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal", + "reference": "e00ce93926c37d7cab0368694715ff913804780c" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/dbal/zipball/e00ce93926c37d7cab0368694715ff913804780c", + "reference": "e00ce93926c37d7cab0368694715ff913804780c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "doctrine/common": "2.3.*" + }, + "time": "1349466076", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\DBAL": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Database Abstraction Layer", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "persistence", + "dbal", + "queryobject" + ] + }, + { + "name": "doctrine/doctrine-bundle", + "version": "dev-master", + "target-dir": "Doctrine/Bundle/DoctrineBundle", + "source": { + "type": "git", + "url": "git://github.com/doctrine/DoctrineBundle.git", + "reference": "e69a6fd75fa3979e35b7004e6da6e9aea3765997" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/DoctrineBundle/zipball/e69a6fd75fa3979e35b7004e6da6e9aea3765997", + "reference": "e69a6fd75fa3979e35b7004e6da6e9aea3765997", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "doctrine/dbal": ">=2.2,<2.4-dev", + "symfony/framework-bundle": ">=2.1,<2.3-dev", + "symfony/doctrine-bridge": ">=2.1,<2.3-dev" + }, + "require-dev": { + "doctrine/orm": ">=2.2,<2.4-dev", + "symfony/yaml": ">=2.1,<2.3-dev", + "symfony/validator": ">=2.1,<2.3-dev" + }, + "suggest": { + "doctrine/orm": "The Doctrine ORM integration is optional in the bundle." + }, + "time": "1349273376", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\Bundle\\DoctrineBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Symfony DoctrineBundle", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "orm", + "persistence", + "dbal" + ] + }, + { + "name": "doctrine/doctrine-migrations-bundle", + "version": "dev-master", + "target-dir": "Doctrine/Bundle/MigrationsBundle", + "source": { + "type": "git", + "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", + "reference": "3792aa78445773387754c6853bbd7f4dcb31f486" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/DoctrineMigrationsBundle/zipball/3792aa78445773387754c6853bbd7f4dcb31f486", + "reference": "3792aa78445773387754c6853bbd7f4dcb31f486", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/symfony": ">=2.0", + "doctrine/migrations": "*" + }, + "time": "1341472972", + "type": "symfony-bundle", + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\Bundle\\MigrationsBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Doctrine Project", + "homepage": "http://www.doctrine-project.org" + } + ], + "description": "Symfony DoctrineMigrationsBundle", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "dbal", + "migrations", + "schema" + ] + }, + { + "name": "doctrine/migrations", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/migrations", + "reference": "b38ddb190ec78d389b2c2de838b2a4d646ad1ce2" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/migrations/zipball/b38ddb190ec78d389b2c2de838b2a4d646ad1ce2", + "reference": "b38ddb190ec78d389b2c2de838b2a4d646ad1ce2", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "doctrine/dbal": ">=2.0,<2.5.x-dev" + }, + "require-dev": { + "symfony/console": "2.*", + "symfony/yaml": "2.*" + }, + "suggest": { + "symfony/console": "to run the migration from the console" + }, + "time": "1349435713", + "type": "library", + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\DBAL\\Migrations": "lib" + } + }, + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Database Schema migrations using Doctrine DBAL", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "migrations" + ] + }, + { + "name": "doctrine/orm", + "version": "2.3.x-dev", + "source": { + "type": "git", + "url": "git://github.com/doctrine/doctrine2.git", + "reference": "564ec1ee2a6a439312ee9105a2a076af7c992e5b" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/doctrine2/zipball/564ec1ee2a6a439312ee9105a2a076af7c992e5b", + "reference": "564ec1ee2a6a439312ee9105a2a076af7c992e5b", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "ext-pdo": "*", + "symfony/console": "2.*", + "doctrine/dbal": "2.3.*" + }, + "suggest": { + "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" + }, + "time": "1349472005", + "bin": [ + "bin/doctrine", + "bin/doctrine.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\ORM": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Object-Relational-Mapper for PHP", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "orm" + ] + }, + { + "name": "easybook/geshi", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/javiereguiluz/geshi", + "reference": "6f5f9c621936faf90d92f355967604fe07f7a60f" + }, + "dist": { + "type": "zip", + "url": "https://github.com/javiereguiluz/geshi/zipball/6f5f9c621936faf90d92f355967604fe07f7a60f", + "reference": "6f5f9c621936faf90d92f355967604fe07f7a60f", + "shasum": "" + }, + "require": { + "php": ">4.3.0" + }, + "time": "1348828425", + "type": "library", + "installation-source": "source", + "autoload": { + "classmap": [ + "./" + ] + }, + "license": [ + "GPL-2.0" + ], + "authors": [ + { + "name": "Benny Baumann", + "email": "BenBE@geshi.org" + }, + { + "name": "Nigel McNie", + "email": "nigel@geshi.org" + } + ], + "description": "GeSHi - Generic Syntax Highlighter. This is an unmodified port of GeSHi project code found on SourceForge.", + "homepage": "http://qbnz.com/highlighter", + "keywords": [ + "syntax", + "highlight", + "highlighter" + ] + }, + { + "name": "egeloen/ckeditor-bundle", + "version": "dev-master", + "target-dir": "Ivory/CKEditorBundle", + "source": { + "type": "git", + "url": "https://github.com/egeloen/IvoryCKEditorBundle", + "reference": "21270e029fe424ba7f748746e6aeace3a11f9943" + }, + "dist": { + "type": "zip", + "url": "https://github.com/egeloen/IvoryCKEditorBundle/zipball/21270e029fe424ba7f748746e6aeace3a11f9943", + "reference": "21270e029fe424ba7f748746e6aeace3a11f9943", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "symfony/framework-bundle": "2.*" + }, + "time": "1346703322", + "type": "symfony-bundle", + "installation-source": "source", + "autoload": { + "psr-0": { + "Ivory\\CKEditorBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eric GELOEN", + "email": "geloen.eric@gmail.com" + } + ], + "description": "Provides a CKEditor integration for your Symfony2 Project.", + "keywords": [ + "CKEditor" + ] + }, + { + "name": "fpn/doctrine-extensions-taggable", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/FabienPennequin/DoctrineExtensions-Taggable", + "reference": "ee7245fc7c3012ea1b1ed932f62ca258b39d8bea" + }, + "dist": { + "type": "zip", + "url": "https://github.com/FabienPennequin/DoctrineExtensions-Taggable/zipball/ee7245fc7c3012ea1b1ed932f62ca258b39d8bea", + "reference": "ee7245fc7c3012ea1b1ed932f62ca258b39d8bea", + "shasum": "" + }, + "require": { + "doctrine/orm": ">=2.0" + }, + "time": "1348171122", + "type": "library", + "installation-source": "source", + "autoload": { + "psr-0": { + "DoctrineExtensions": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Pennequin", + "email": "fabien@pennequin.me" + } + ], + "description": "Tag system using Doctrine ORM", + "keywords": [ + "Taggable", + "tag" + ] + }, + { + "name": "fpn/tag-bundle", + "version": "dev-master", + "target-dir": "FPN/TagBundle", + "source": { + "type": "git", + "url": "https://github.com/FabienPennequin/FPNTagBundle", + "reference": "7fa1408d2a57120e8d9da8a95fb7d2ad3223c5e3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/FabienPennequin/FPNTagBundle/zipball/7fa1408d2a57120e8d9da8a95fb7d2ad3223c5e3", + "reference": "7fa1408d2a57120e8d9da8a95fb7d2ad3223c5e3", + "shasum": "" + }, + "require": { + "fpn/doctrine-extensions-taggable": "*", + "symfony/framework-bundle": ">=2.0" + }, + "time": "1348171166", + "type": "symfony-bundle", + "installation-source": "source", + "autoload": { + "psr-0": { + "FPN\\TagBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Pennequin", + "email": "fabien@pennequin.me" + } + ], + "description": "FPN Tag Bundle", + "keywords": [ + "tag", + "tagging" + ] + }, + { + "name": "gedmo/doctrine-extensions", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/l3pp4rd/DoctrineExtensions.git", + "reference": "0add69ccb0cb22e3216c30166805ae27615cb8f0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/l3pp4rd/DoctrineExtensions/zipball/0add69ccb0cb22e3216c30166805ae27615cb8f0", + "reference": "0add69ccb0cb22e3216c30166805ae27615cb8f0", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "doctrine/common": ">=2.2,<2.5-dev" + }, + "suggest": { + "doctrine/orm": ">=2.1", + "doctrine/mongodb-odm": "*" + }, + "time": "1349375111", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Gedmo": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gediminas Morkevicius", + "email": "gediminas.morkevicius@gmail" + } + ], + "description": "Doctrine2 behavioral extensions", + "homepage": "http://gediminasm.org/", + "keywords": [ + "tree", + "behaviors", + "doctrine2", + "extensions", + "gedmo", + "sluggable", + "loggable", + "translatable", + "nestedset", + "sortable", + "timestampable" + ] + }, + { + "name": "gergelypolonkai/tcpdfbundle", + "version": "dev-master", + "target-dir": "Io/TcpdfBundle", + "source": { + "type": "git", + "url": "https://github.com/gergelypolonkai/IoTcpdfBundle", + "reference": "7cc9aed4839b2896de34ff3ea1155be1a1e4708c" + }, + "dist": { + "type": "zip", + "url": "https://github.com/gergelypolonkai/IoTcpdfBundle/zipball/7cc9aed4839b2896de34ff3ea1155be1a1e4708c", + "reference": "7cc9aed4839b2896de34ff3ea1155be1a1e4708c", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "symfony/framework-bundle": "2.1.*", + "tcpdf/tcpdf": ">=5.9.162" + }, + "time": "1344002478", + "type": "symfony-bundle", + "installation-source": "source", + "autoload": { + "psr-0": { + "Io\\TcpdfBundle": "" + } + }, + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Alessio", + "email": "Unknown, http://github.com/ioalessio" + }, + { + "name": "Gergely Polonkai", + "email": "gergely@polonkai.eu" + } + ], + "description": "Provides TCPDF integration for Symfony", + "keywords": [ + "tcpdf", + "pdf" + ], + "support": { + "source": "https://github.com/gergelypolonkai/IoTcpdfBundle/tree/master" + } + }, + { + "name": "jms/aop-bundle", + "version": "1.0.0", + "target-dir": "JMS/AopBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSAopBundle", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSAopBundle/zipball/1.0.0", + "reference": "1.0.0", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.*", + "jms/cg": "1.0.0" + }, + "time": "2012-01-02 20:50:26", + "type": "symfony-bundle", + "installation-source": "dist", + "autoload": { + "psr-0": { + "JMS\\AopBundle": "" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Adds AOP capabilities to Symfony2", + "keywords": [ + "annotations", + "aop" + ] + }, + { + "name": "jms/cg", + "version": "1.0.0", + "source": { + "type": "git", + "url": "git://github.com/schmittjoh/cg-library.git", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/cg-library/zipball/1.0.0", + "reference": "1.0.0", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2012-01-02 20:40:52", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "CG\\": "src/" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Toolset for generating PHP code", + "keywords": [ + "code generation" + ] + }, + { + "name": "jms/di-extra-bundle", + "version": "1.1.x-dev", + "target-dir": "JMS/DiExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle", + "reference": "1.1.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/1.1.1", + "reference": "1.1.1", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*", + "jms/aop-bundle": "1.0.*", + "jms/metadata": "1.1.*", + "symfony/process": "2.1.*", + "symfony/finder": "2.1.*" + }, + "require-dev": { + "jms/security-extra-bundle": "1.*", + "symfony/validator": "*", + "symfony/form": "*", + "symfony/class-loader": "*", + "symfony/yaml": "*", + "symfony/browser-kit": "*", + "symfony/security-bundle": "*", + "symfony/twig-bundle": "*", + "sensio/framework-extra-bundle": "*", + "doctrine/doctrine-bundle": "*", + "doctrine/orm": "*" + }, + "time": "1348217792", + "type": "symfony-bundle", + "installation-source": "source", + "autoload": { + "psr-0": { + "JMS\\DiExtraBundle": "" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Allows to configure dependency injection using annotations", + "homepage": "http://jmsyst.com/bundles/JMSDiExtraBundle", + "keywords": [ + "dependency injection", + "annotations" + ] + }, + { + "name": "jms/metadata", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/metadata", + "reference": "1.1.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/metadata/zipball/1.1.1", + "reference": "1.1.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2012-01-02 21:32:49", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Metadata\\": "src/" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Class/method/property metadata management in PHP", + "keywords": [ + "annotations", + "yaml", + "xml", + "metadata" + ] + }, + { + "name": "jms/security-extra-bundle", + "version": "1.2.x-dev", + "target-dir": "JMS/SecurityExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle", + "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/zipball/9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", + "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*", + "symfony/security-bundle": "*", + "jms/metadata": "1.1.*", + "jms/aop-bundle": "1.0.*", + "jms/di-extra-bundle": "1.1.*" + }, + "require-dev": { + "sensio/framework-extra-bundle": "*", + "symfony/class-loader": "*", + "symfony/yaml": "*", + "symfony/browser-kit": "*", + "symfony/finder": "*", + "symfony/css-selector": "*", + "symfony/process": "*", + "doctrine/doctrine-bundle": "*", + "symfony/twig-bundle": "*", + "doctrine/orm": "*", + "symfony/form": "*", + "symfony/validator": "*" + }, + "time": "1346947943", + "type": "symfony-bundle", + "installation-source": "source", + "autoload": { + "psr-0": { + "JMS\\SecurityExtraBundle": "" + } + }, + "license": [ + "Apache2" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Enhances the Symfony2 Security Component by adding several new features", + "homepage": "http://jmsyst.com/bundles/JMSSecurityExtraBundle", + "keywords": [ + "annotations", + "authorization", + "security", + "secure", + "expression" + ] + }, + { + "name": "kriswallsmith/assetic", + "version": "dev-master", + "source": { + "type": "git", + "url": "http://github.com/kriswallsmith/assetic.git", + "reference": "e22c5e07e672bb0cf43127e97e9368b53abf4aa8" + }, + "dist": { + "type": "zip", + "url": "https://github.com/kriswallsmith/assetic/zipball/e22c5e07e672bb0cf43127e97e9368b53abf4aa8", + "reference": "e22c5e07e672bb0cf43127e97e9368b53abf4aa8", + "shasum": "" + }, + "require": { + "symfony/process": ">=2.1.0,<2.3-dev", + "php": ">=5.3.1" + }, + "require-dev": { + "twig/twig": ">=1.6.0,<2.0", + "leafo/lessphp": "*", + "leafo/scssphp": "*", + "ptachoire/cssembed": "*", + "leafo/scssphp-compass": "*" + }, + "suggest": { + "twig/twig": "Assetic provides the integration with the Twig templating engine", + "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", + "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", + "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", + "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin" + }, + "time": "1349004759", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Assetic": "src/" + }, + "files": [ + "src/functions.php" + ] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Asset Management for PHP", + "homepage": "https://github.com/kriswallsmith/assetic", + "keywords": [ + "assets", + "compression", + "minification" + ] + }, + { + "name": "monolog/monolog", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog", + "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48" + }, + "dist": { + "type": "zip", + "url": "https://github.com/Seldaek/monolog/zipball/09b3a80cfaf3e323e348a5e817afeee98d5e6b48", + "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "mlehner/gelf-php": "1.0.*" + }, + "suggest": { + "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-mongo": "Allow sending log messages to a MongoDB server" + }, + "time": "1347983448", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Monolog": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be", + "role": "Developer" + } + ], + "description": "Logging for PHP 5.3", + "homepage": "http://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging" + ] + }, + { + "name": "sensio/distribution-bundle", + "version": "2.1.x-dev", + "target-dir": "Sensio/Bundle/DistributionBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioDistributionBundle", + "reference": "v2.1.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.1", + "reference": "v2.1.1", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*" + }, + "time": "1347340208", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\DistributionBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "The base bundle for the Symfony Distributions", + "keywords": [ + "distribution", + "configuration" + ] + }, + { + "name": "sensio/framework-extra-bundle", + "version": "2.1.x-dev", + "target-dir": "Sensio/Bundle/FrameworkExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle", + "reference": "bf2ea090d602e02b975d1bf1d8ffca8f02ef8bdb" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/bf2ea090d602e02b975d1bf1d8ffca8f02ef8bdb", + "reference": "bf2ea090d602e02b975d1bf1d8ffca8f02ef8bdb", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*", + "doctrine/common": ">=2.1,<2.4-dev" + }, + "time": "1349361259", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\FrameworkExtraBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle provides a way to configure your controllers with annotations", + "keywords": [ + "annotations", + "controllers" + ] + }, + { + "name": "sensio/generator-bundle", + "version": "2.1.x-dev", + "target-dir": "Sensio/Bundle/GeneratorBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioGeneratorBundle", + "reference": "3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0", + "reference": "3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*", + "symfony/console": "2.1.*" + }, + "require-dev": { + "symfony/doctrine-bridge": "2.1.*", + "doctrine/orm": ">=2.1,<2.4-dev", + "twig/twig": ">=1.8,<2.0-dev" + }, + "time": "1348030981", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\GeneratorBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle generates code for you" + }, + { + "name": "stof/doctrine-extensions-bundle", + "version": "dev-master", + "target-dir": "Stof/DoctrineExtensionsBundle", + "source": { + "type": "git", + "url": "https://github.com/stof/StofDoctrineExtensionsBundle", + "reference": "773b37310ca244570032541be3c8ab27b814a83f" + }, + "dist": { + "type": "zip", + "url": "https://github.com/stof/StofDoctrineExtensionsBundle/zipball/773b37310ca244570032541be3c8ab27b814a83f", + "reference": "773b37310ca244570032541be3c8ab27b814a83f", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/framework-bundle": "2.1.*", + "gedmo/doctrine-extensions": ">=2.3-dev" + }, + "suggest": { + "doctrine/doctrine-bundle": "*", + "doctrine/mongodb-odm-bundle": "2.1.*" + }, + "time": "1349111035", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Stof\\DoctrineExtensionsBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christophe Coevoet", + "email": "stof@notk.org" + } + ], + "description": "Integration of the gedmo/doctrine-extensions with Symfony2", + "homepage": "https://github.com/stof/StofDoctrineExtensionsBundle", + "keywords": [ + "tree", + "behaviors", + "doctrine2", + "extensions", + "gedmo", + "sluggable", + "loggable", + "translatable", + "nestedset", + "sortable", + "timestampable" + ] + }, + { + "name": "swiftmailer/swiftmailer", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/swiftmailer/swiftmailer.git", + "reference": "22731e907f5ca288c9bfde6b54f3611ace0a6c39" + }, + "dist": { + "type": "zip", + "url": "https://github.com/swiftmailer/swiftmailer/zipball/22731e907f5ca288c9bfde6b54f3611ace0a6c39", + "reference": "22731e907f5ca288c9bfde6b54f3611ace0a6c39", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "time": "1349196829", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "installation-source": "source", + "autoload": { + "files": [ + "lib/swift_required.php" + ] + }, + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Chris Corbyn" + } + ], + "description": "Swiftmailer, free feature-rich PHP mailer", + "homepage": "http://swiftmailer.org", + "keywords": [ + "mail", + "mailer" + ] + }, + { + "name": "symfony/assetic-bundle", + "version": "dev-master", + "target-dir": "Symfony/Bundle/AsseticBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/AsseticBundle", + "reference": "5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/AsseticBundle/zipball/5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2", + "reference": "5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "kriswallsmith/assetic": "1.1.*", + "symfony/framework-bundle": ">=2.1.0,<2.3-dev" + }, + "require-dev": { + "symfony/twig-bundle": ">=2.1.0,<2.3-dev", + "symfony/console": ">=2.1.0,<2.3-dev", + "symfony/class-loader": ">=2.1.0,<2.3-dev", + "symfony/yaml": ">=2.1.0,<2.3-dev", + "symfony/form": ">=2.1.0,<2.3-dev", + "symfony/dom-crawler": ">=2.1.0,<2.3-dev", + "symfony/css-selector": ">=2.1.0,<2.3-dev" + }, + "suggest": { + "symfony/twig-bundle": ">=2.1.0,<2.3-dev" + }, + "time": "1348938560", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\AsseticBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Integrates Assetic into Symfony2", + "homepage": "https://github.com/symfony/AsseticBundle", + "keywords": [ + "assets", + "compression", + "minification" + ] + }, + { + "name": "symfony/monolog-bundle", + "version": "dev-master", + "target-dir": "Symfony/Bundle/MonologBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/MonologBundle", + "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/MonologBundle/zipball/51517152a608926ee6b40ed8cfbba1a708f0a14f", + "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "monolog/monolog": "1.*", + "symfony/monolog-bridge": ">=2.1.0,<2.3-dev", + "symfony/dependency-injection": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev" + }, + "require-dev": { + "symfony/yaml": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev" + }, + "time": "1348137624", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\MonologBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony MonologBundle", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/swiftmailer-bundle", + "version": "dev-master", + "target-dir": "Symfony/Bundle/SwiftmailerBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/SwiftmailerBundle", + "reference": "e055faf5d7279f3c01ffd58f1548e0fc524b71d1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/SwiftmailerBundle/zipball/e055faf5d7279f3c01ffd58f1548e0fc524b71d1", + "reference": "e055faf5d7279f3c01ffd58f1548e0fc524b71d1", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev", + "symfony/swiftmailer-bridge": ">=2.1.0,<2.3-dev" + }, + "require-dev": { + "symfony/dependency-injection": ">=2.1.0,<2.3-dev", + "symfony/http-kernel": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev", + "symfony/yaml": ">=2.1.0,<2.3-dev" + }, + "time": "1348137776", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\SwiftmailerBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony SwiftmailerBundle", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/symfony", + "version": "2.1.x-dev", + "source": { + "type": "git", + "url": "git://github.com/symfony/symfony.git", + "reference": "8062031a0a5143086f2ff864925dada9614f2ead" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/symfony/zipball/8062031a0a5143086f2ff864925dada9614f2ead", + "reference": "8062031a0a5143086f2ff864925dada9614f2ead", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "doctrine/common": ">2.2,<2.4-dev", + "twig/twig": ">=1.9.1,<2.0-dev" + }, + "replace": { + "symfony/doctrine-bridge": "self.version", + "symfony/monolog-bridge": "self.version", + "symfony/propel1-bridge": "self.version", + "symfony/swiftmailer-bridge": "self.version", + "symfony/twig-bridge": "self.version", + "symfony/framework-bundle": "self.version", + "symfony/security-bundle": "self.version", + "symfony/twig-bundle": "self.version", + "symfony/web-profiler-bundle": "self.version", + "symfony/browser-kit": "self.version", + "symfony/class-loader": "self.version", + "symfony/config": "self.version", + "symfony/console": "self.version", + "symfony/css-selector": "self.version", + "symfony/dependency-injection": "self.version", + "symfony/dom-crawler": "self.version", + "symfony/event-dispatcher": "self.version", + "symfony/filesystem": "self.version", + "symfony/finder": "self.version", + "symfony/form": "self.version", + "symfony/http-foundation": "self.version", + "symfony/http-kernel": "self.version", + "symfony/locale": "self.version", + "symfony/options-resolver": "self.version", + "symfony/process": "self.version", + "symfony/routing": "self.version", + "symfony/security": "self.version", + "symfony/serializer": "self.version", + "symfony/templating": "self.version", + "symfony/translation": "self.version", + "symfony/validator": "self.version", + "symfony/yaml": "self.version" + }, + "require-dev": { + "doctrine/dbal": ">=2.2,<2.4-dev", + "doctrine/orm": ">=2.2.3,<2.4-dev", + "doctrine/data-fixtures": "1.0.*", + "propel/propel1": "dev-master", + "monolog/monolog": "dev-master" + }, + "time": "1349381694", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony": "src/", + "SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stubs" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "The Symfony PHP framework", + "homepage": "http://symfony.com", + "keywords": [ + "framework" + ] + }, + { + "name": "tcpdf/tcpdf", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://tcpdf.git.sourceforge.net/gitroot/tcpdf/tcpdf", + "reference": "f2aa41dd8252ad6321bad88776889b75b127a60c" + }, + "dist": { + "type": "zip", + "url": "https://github.com/tcpdf/tcpdf/zipball/5.9.176", + "reference": "5.9.176", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "1348597020", + "type": "library", + "installation-source": "source", + "autoload": { + "classmap": [ + "fonts", + "config/lang", + "config", + "2dbarcodes.php", + "barcodes.php", + "datamatrix.php", + "encodings_maps.php", + "htmlcolors.php", + "pdf417.php", + "qrcode.php", + "spotcolors.php", + "tcpdf.php", + "tcpdf_filters.php", + "tcpdf_parser.php", + "unicode_data.php" + ] + }, + "license": [ + "LGPLv3" + ], + "authors": [ + { + "name": "Nicola Asuni", + "email": "info@tecnick.com", + "homepage": "http://nicolaasuni.tecnick.com" + } + ], + "description": "TCPDF is a PHP class for generating PDF documents.", + "homepage": "http://www.tcpdf.org/", + "keywords": [ + "pdf", + "TCPDF", + "qrcode", + "PDFD32000-2008", + "datamatrix", + "pdf417", + "barcodes" + ] + }, + { + "name": "twig/extensions", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/fabpot/Twig-extensions", + "reference": "f904575642b1213db69b4a98f08397e722ba1cae" + }, + "dist": { + "type": "zip", + "url": "https://github.com/fabpot/Twig-extensions/zipball/f904575642b1213db69b4a98f08397e722ba1cae", + "reference": "f904575642b1213db69b4a98f08397e722ba1cae", + "shasum": "" + }, + "require": { + "twig/twig": "1.*" + }, + "time": "1346770278", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Twig_Extensions_": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Common additional features for Twig that do not directly belong in core", + "homepage": "https://github.com/fabpot/Twig-extensions", + "keywords": [ + "debug", + "i18n", + "text" + ] + }, + { + "name": "twig/twig", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/fabpot/Twig.git", + "reference": "5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/fabpot/Twig/zipball/5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1", + "reference": "5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "time": "1349508092", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Twig_": "lib/" + } + }, + "license": [ + "BSD-3" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "http://twig.sensiolabs.org", + "keywords": [ + "templating" + ] + } + ], + "packages-dev": null, + "aliases": [ + + ], + "minimum-stability": "dev", + "stability-flags": { + "easybook/geshi": 20, + "stof/doctrine-extensions-bundle": 20, + "doctrine/doctrine-migrations-bundle": 20, + "fpn/tag-bundle": 20, + "egeloen/ckeditor-bundle": 20, + "gergelypolonkai/tcpdfbundle": 20 + } +} diff --git a/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php b/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php index 59c86d7..b7ba07c 100644 --- a/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php +++ b/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php @@ -55,7 +55,7 @@ class AdminController extends Controller * @Route("/blog/post/{id}", name="GergelyPolonkaiFrontBundle_adminEditBlogPost", defaults={"id": null}) * @Template */ - public function newBlogPostAction($id = null) + public function editBlogPostAction($id = null) { if (is_numeric($id)) { $post = $this->getDoctrine()->getRepository('GergelyPolonkaiFrontBundle:Post')->findOneById($id); @@ -73,8 +73,8 @@ class AdminController extends Controller if ($request->getMethod() === 'POST') { $form->bind($request); if ($form->isValid()) { + $tagManager = $this->get('fpn_tag.tag_manager'); if (($tags = $form->get('tags')->getData()) != '') { - $tagManager = $this->get('fpn_tag.tag_manager'); $tagNames = $tagManager->splitTagNames($tags); $tagList = $tagManager->loadOrCreateTags($tagNames); $tagManager->addTags($tagList, $post); diff --git a/src/GergelyPolonkai/FrontBundle/Controller/BlogController.php b/src/GergelyPolonkai/FrontBundle/Controller/BlogController.php index 18114d4..604bfe0 100644 --- a/src/GergelyPolonkai/FrontBundle/Controller/BlogController.php +++ b/src/GergelyPolonkai/FrontBundle/Controller/BlogController.php @@ -4,9 +4,11 @@ namespace GergelyPolonkai\FrontBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Doctrine\ORM\Tools\Pagination\Paginator; use GergelyPolonkai\FrontBundle\Entity\Post; +use GergelyPolonkai\FrontBundle\Entity\Tag; /** * Description of BlogController @@ -17,6 +19,9 @@ use GergelyPolonkai\FrontBundle\Entity\Post; */ class BlogController extends Controller { + // TODO: Make this a config parameter + private $postsPerPage = 10; + /** * @Route("/", name="GergelyPolonkaiFrontBundle_blogListing") * @Route("/page/{cPage}", name="GergelyPolonkaiFrontBundle_blogListingPage", requirements={"cPage": "\d+"}) @@ -24,16 +29,14 @@ class BlogController extends Controller */ public function listAction($cPage = 1) { - // TODO: Make this a config parameter - $postsPerPage = 10; --$cPage; $query = $this ->getDoctrine() ->getEntityManager() ->createQuery("SELECT p FROM GergelyPolonkaiFrontBundle:Post p WHERE p.draft = FALSE ORDER BY p.createdAt DESC") - ->setFirstResult($cPage * $postsPerPage) - ->setMaxResults($postsPerPage); + ->setFirstResult($cPage * $this->postsPerPage) + ->setMaxResults($this->postsPerPage); $paginator = new Paginator($query, $fetchJoinCollection = true); $tagManager = $this->get('fpn_tag.tag_manager'); @@ -42,13 +45,13 @@ class BlogController extends Controller } $count = $paginator->count(); - $pageCount = ceil($count / $postsPerPage); + $pageCount = ceil($count / $this->postsPerPage); return array( 'cpage' => $cPage, 'count' => $pageCount, 'posts' => $paginator, - 'perPage' => $postsPerPage, + 'perPage' => $this->postsPerPage, ); } @@ -93,4 +96,43 @@ class BlogController extends Controller 'posts' => $posts, ); } + + /** + * @Route("/tag/{name}/", name="GergelyPolonkaiFrontBundle_blogTagList") + * @Route("/tag/{name}/page/{cPage}", name="GergelyPolonkaiFrontBundle_blogListingPage", requirements={"cPage": "\d+"}) + * @Template("GergelyPolonkaiFrontBundle:Blog:list.html.twig") + * @ParamConverter("tag") + */ + public function tagListAction(Tag $tag, $cPage = 1) + { + $tagRepository = $this->getDoctrine()->getRepository('GergelyPolonkaiFrontBundle:Tag'); + + $ids = $tagRepository->getResourceIdsForTag('gergelypolonkaifront_post', $tag->getName()); + + --$cPage; + + $query = $this + ->getDoctrine() + ->getEntityManager() + ->createQuery("SELECT p FROM GergelyPolonkaiFrontBundle:Post p WHERE p.draft = FALSE AND p.id IN (:idList) ORDER BY p.createdAt DESC") + ->setParameter('idList', $ids) + ->setFirstResult($cPage * $this->postsPerPage) + ->setMaxResults($this->postsPerPage); + + $paginator = new Paginator($query, $fetchJoinCollection = true); + $tagManager = $this->get('fpn_tag.tag_manager'); + foreach ($paginator as $post) { + $tagManager->loadTagging($post); + } + + $count = $paginator->count(); + $pageCount = ceil($count / $this->postsPerPage); + + return array( + 'cpage' => $cPage, + 'count' => $pageCount, + 'posts' => $paginator, + 'perPage' => $this->postsPerPage, + ); + } } diff --git a/src/GergelyPolonkai/FrontBundle/Entity/CodeChunk.php b/src/GergelyPolonkai/FrontBundle/Entity/CodeChunk.php index 01a81ac..8dfbd01 100644 --- a/src/GergelyPolonkai/FrontBundle/Entity/CodeChunk.php +++ b/src/GergelyPolonkai/FrontBundle/Entity/CodeChunk.php @@ -189,4 +189,4 @@ class CodeChunk { return $this->content; } -} +} \ No newline at end of file diff --git a/src/GergelyPolonkai/FrontBundle/Entity/Comment.php b/src/GergelyPolonkai/FrontBundle/Entity/Comment.php index a42c7ca..56f7a1d 100644 --- a/src/GergelyPolonkai/FrontBundle/Entity/Comment.php +++ b/src/GergelyPolonkai/FrontBundle/Entity/Comment.php @@ -195,4 +195,4 @@ class Comment { return $this->user; } -} +} \ No newline at end of file diff --git a/src/GergelyPolonkai/FrontBundle/Entity/Post.php b/src/GergelyPolonkai/FrontBundle/Entity/Post.php index 1049db3..e0efd31 100644 --- a/src/GergelyPolonkai/FrontBundle/Entity/Post.php +++ b/src/GergelyPolonkai/FrontBundle/Entity/Post.php @@ -293,4 +293,4 @@ class Post implements Taggable { return $this->id; } -} +} \ No newline at end of file diff --git a/src/GergelyPolonkai/FrontBundle/Entity/Tag.php b/src/GergelyPolonkai/FrontBundle/Entity/Tag.php index 944be54..0e9e19e 100644 --- a/src/GergelyPolonkai/FrontBundle/Entity/Tag.php +++ b/src/GergelyPolonkai/FrontBundle/Entity/Tag.php @@ -9,7 +9,7 @@ use FPN\TagBundle\Entity\Tag as BaseTag; * * @author polesz * - * @ORM\Entity + * @ORM\Entity(repositoryClass="DoctrineExtensions\Taggable\Entity\TagRepository") * @ORM\Table(name="tags") */ class Tag extends BaseTag @@ -31,4 +31,4 @@ class Tag extends BaseTag * @ORM\OneToMany(targetEntity="Tagging", mappedBy="tag", fetch="EAGER") */ protected $tagging; -} +} \ No newline at end of file diff --git a/src/GergelyPolonkai/FrontBundle/Entity/Tagging.php b/src/GergelyPolonkai/FrontBundle/Entity/Tagging.php index 3dceb76..fe6a39b 100644 --- a/src/GergelyPolonkai/FrontBundle/Entity/Tagging.php +++ b/src/GergelyPolonkai/FrontBundle/Entity/Tagging.php @@ -33,4 +33,4 @@ class Tagging extends BaseTagging * @ORM\ManyToOne(targetEntity="Tag") */ protected $tag; -} +} \ No newline at end of file diff --git a/src/GergelyPolonkai/FrontBundle/Entity/User.php b/src/GergelyPolonkai/FrontBundle/Entity/User.php index bd5b83a..cdc4d8c 100644 --- a/src/GergelyPolonkai/FrontBundle/Entity/User.php +++ b/src/GergelyPolonkai/FrontBundle/Entity/User.php @@ -135,4 +135,4 @@ class User implements UserInterface { return $this->password; } -} +} \ No newline at end of file diff --git a/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css b/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css index d8226bc..9204958 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css +++ b/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css @@ -165,4 +165,33 @@ dd p { #more-posts { margin-top: 1em; text-align: right; +} + +#tag-cloud a { + color: #b3b3b3; + text-decoration: none; +} + +#tag-cloud .size0 { + font-size: 80%; +} + +#tag-cloud .size1 { + font-size: 90%; +} + +#tag-cloud .size2 { + font-size: 100%; +} + +#tag-cloud .size3 { + font-size: 110%; +} + +#tag-cloud .size4 { + font-size: 130%; +} + +#tag-cloud .size5 { + font-size: 150%; } \ No newline at end of file diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Admin/newBlogPost.html.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Admin/editBlogPost.html.twig similarity index 100% rename from src/GergelyPolonkai/FrontBundle/Resources/views/Admin/newBlogPost.html.twig rename to src/GergelyPolonkai/FrontBundle/Resources/views/Admin/editBlogPost.html.twig diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/list.html.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/list.html.twig index da9c0d1..d17da7b 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/list.html.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/list.html.twig @@ -26,6 +26,9 @@ {% block content %} {{ block('paginator') }} +{% if posts|length == 0 %} +No posts found. +{% endif %} {% for post in posts %} {% include 'GergelyPolonkaiFrontBundle:Blog:postViewer.html.twig' with {'post': post, 'title_links': true} %} {% endfor %} diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/postViewer.html.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/postViewer.html.twig index 5d07667..5e9bb11 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/postViewer.html.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/postViewer.html.twig @@ -5,7 +5,7 @@ {% if post.tags|length > 0 %}

Tags: {% for tag in post.tags %} - {{ tag.name }} + {{ tag.name }} {% endfor %}

{% endif %} diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig index 059820e..b2893ce 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig @@ -34,6 +34,13 @@
+{% if tagCloud|length > 0 %} +
+{% for cloudItem in tagCloud %} + {{ cloudItem.name }} +{% endfor %} +
+{% endif %}