Upgraded to Symfony 2.2

This leaves some issues open!

app/AppKernel.php

@@ -22,9 +22,9 @@ class AppKernel extends Kernel
             // 3rd party bundles
             new Ivory\CKEditorBundle\IvoryCKEditorBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
-            new Io\TcpdfBundle\IoTcpdfBundle(),
+            new Knp\Bundle\SnappyBundle\KnpSnappyBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
-            new Jmikola\JsAssetsHelperBundle\JmikolaJsAssetsHelperBundle(),
+            new JMS\TwigJsBundle\JMSTwigJsBundle(),
             // Own bundles
             new KekRozsak\FrontBundle\KekRozsakFrontBundle(),
             new KekRozsak\SecurityBundle\KekRozsakSecurityBundle(),

app/config/config.yml

@@ -8,9 +8,6 @@ jms_di_extra:
         bundles: [ KekRozsakFrontBundle, KekRozsakSecurityBundle ]
         directories: [ "%kernel.root_dir%/../src" ]
 
-jmikola_js_assets_helper:
-    packages_to_expose: [ KekRozsakFrontBundle ]
-
 framework:
     #esi:             ~
     #translator:      { fallback: %locale% }
@@ -22,7 +19,7 @@ framework:
     validation:      { enable_annotations: true }
     templating:
         engines: ['twig']
-        packages: 
+        packages:
             KekRozsakFrontBundle: ~
     default_locale:  %locale%
     trust_proxy_headers: false # Should Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP)

app/config/routing.yml

@@ -1,9 +1,6 @@
 fos_js_routing:
     resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
 
-jmikola_js_assets_helper_routing:
-    resource: "@JmikolaJsAssetsHelperBundle/Resources/config/routing/routing.xml"
-
 KekRozsakAdminBundle:
     resource: "@KekRozsakAdminBundle/Controller/"
     type:     annotation

composer.json

@@ -1,6 +1,6 @@
 {
-    "name": "symfony/framework-standard-edition",
-    "description": "The \"Symfony Standard Edition\" distribution",
+    "name": "gergelypolonkai/kekrozsak",
+    "description": "blueroses.hu web page",
     "autoload": {
         "psr-0": { "": "src/" }
     },
@@ -11,38 +11,12 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
-        "symfony/symfony": "2.1.*",
-        "doctrine/orm": ">=2.2.3,<2.4-dev",
-        "doctrine/doctrine-bundle": "1.0.*",
-        "twig/extensions": "1.0.*",
-        "symfony/assetic-bundle": "2.1.*",
-        "symfony/swiftmailer-bundle": "2.1.*",
-        "symfony/monolog-bundle": "2.1.*",
-        "sensio/distribution-bundle": "2.1.*",
-        "sensio/framework-extra-bundle": "2.1.*",
-        "sensio/generator-bundle": "2.1.*",
-        "jms/security-extra-bundle": "1.2.*",
-        "jms/di-extra-bundle": "1.1.*",
-	"doctrine/doctrine-migrations-bundle": "dev-master",
+        "symfony/framework-standard-edition": "2.2.*",
+        "doctrine/doctrine-migrations-bundle": "dev-master",
         "egeloen/ckeditor-bundle": "dev-master",
-	"friendsofsymfony/jsrouting-bundle": "1.1.0",
-        "jmikola/js-assets-helper-bundle": "dev-master",
-        "gergelypolonkai/tcpdfbundle": "dev-master"
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
-        ],
-        "post-update-cmd": [
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
-        ]
+        "friendsofsymfony/jsrouting-bundle": "1.1.*",
+        "jms/twig-js-bundle": "dev-master",
+        "knplabs/knp-snappy-bundle": "dev-master"
     },
     "minimum-stability": "dev",
     "extra": {

src/KekRozsak/FrontBundle/Resources/views/Default/main_template.html.twig

@@ -17,8 +17,6 @@
         <script type="text/javascript" src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
         <script type="text/javascript" src="{{ path('fos_js_routing_js', {callback: 'fos.Router.setData'}) }}"></script>
         <script type="text/javascript" src="{{ asset('js/jquery-form/jquery.form.js') }}"></script>
-        <script type="text/javascript" src="{{ asset('bundles/jmikolajsassetshelper/js/assets_helper.js') }}"></script>
-        <script type="text/javascript" src="{{ path('jmikola_js_assets_helper_js') }}"></script>
 {% javascripts 'bundles/kekrozsakfront/js/*' output='js/kekrozsak.js' %}
         <script type="text/javascript" src="{{ asset_url }}"></script>
 {% endjavascripts %}