Updated to Symfony 2.1 stable

This commit is contained in:
Gergely Polonkai 2012-12-20 21:32:35 +01:00
parent 0f112feabe
commit ceb1f3be9d
4 changed files with 1660 additions and 21 deletions

1
.gitignore vendored
View File

@ -13,7 +13,6 @@ web/bundles/*
app/config/parameters.ini app/config/parameters.ini
# Composer related files # Composer related files
composer.lock
vendor/composer/installed.json vendor/composer/installed.json
# Assetic-generated .js and .css files # Assetic-generated .js and .css files

View File

@ -7,26 +7,26 @@
"repositories": [ "repositories": [
{ {
"type": "vcs", "type": "vcs",
"url": "http://github.com/w00d5t0ck/IoTcpdfBundle" "url": "https://github.com/gergelypolonkai/IoTcpdfBundle"
} }
], ],
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"symfony/symfony": "2.1.*", "symfony/symfony": "2.1.*",
"doctrine/orm": "2.2.*", "doctrine/orm": ">=2.2.3,<2.4-dev",
"doctrine/doctrine-bundle": "dev-master", "doctrine/doctrine-bundle": "1.0.*",
"twig/extensions": "dev-master", "twig/extensions": "1.0.*",
"symfony/assetic-bundle": "dev-master", "symfony/assetic-bundle": "2.1.*",
"symfony/swiftmailer-bundle": "dev-master", "symfony/swiftmailer-bundle": "2.1.*",
"symfony/monolog-bundle": "dev-master", "symfony/monolog-bundle": "2.1.*",
"sensio/distribution-bundle": "dev-master", "sensio/distribution-bundle": "2.1.*",
"sensio/framework-extra-bundle": "dev-master", "sensio/framework-extra-bundle": "2.1.*",
"sensio/generator-bundle": "dev-master", "sensio/generator-bundle": "2.1.*",
"jms/security-extra-bundle": "1.1.*", "jms/security-extra-bundle": "1.2.*",
"jms/di-extra-bundle": "1.0.*", "jms/di-extra-bundle": "1.1.*",
"doctrine/doctrine-migrations-bundle": "dev-master", "doctrine/doctrine-migrations-bundle": "dev-master",
"egeloen/ckeditor-bundle": "dev-master", "egeloen/ckeditor-bundle": "dev-master",
"friendsofsymfony/jsrouting-bundle": "dev-master", "friendsofsymfony/jsrouting-bundle": "1.1.0",
"jmikola/js-assets-helper-bundle": "dev-master", "jmikola/js-assets-helper-bundle": "dev-master",
"gergelypolonkai/tcpdfbundle": "dev-master" "gergelypolonkai/tcpdfbundle": "dev-master"
}, },
@ -44,9 +44,6 @@
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
] ]
}, },
"config": {
"bin-dir": "bin"
},
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {
"symfony-app-dir": "app", "symfony-app-dir": "app",

1646
composer.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -21,10 +21,7 @@ class DefaultController extends Controller
->getDoctrine() ->getDoctrine()
->getRepository('KekRozsakFrontBundle:Article') ->getRepository('KekRozsakFrontBundle:Article')
->findOneBy( ->findOneBy(
array('mainPage' => true), array('mainPage' => true)
true,
array('createdAt', 'DESC'),
1
); );
if (!$mainPageArticle) { if (!$mainPageArticle) {
throw $this->createNotFoundException('A keresett cikk nem létezik!'); throw $this->createNotFoundException('A keresett cikk nem létezik!');