Skip to content

jity
jity
Commit 1dffff88 authored by Hermann Mayer's avatar Hermann Mayer
Browse files
Options

Upgraded to SF 2.1.2, Doctrine 2.3.0. Fixed some minor bugs on overall flash message

parent bf405e2a
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 49 deletions
app/Resources/views/base.html.twig
View file @ 1dffff88
......@@ -22,6 +22,8 @@
<body>
{% render 'JityHomepageBundle:Default:overallProcess' %}
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar-header">
<div class="container">
......
app/SymfonyRequirements.php
View file @ 1dffff88
......@@ -477,13 +477,7 @@ class SymfonyRequirements extends RequirementCollection
$this->addPhpIniRequirement('detect_unicode', false);
ob_start();
phpinfo();
$phpinfo = ob_get_contents();
ob_end_clean();
// the phpinfo check is necessary when Suhosin is compiled into PHP
if (extension_loaded('suhosin') || false !== strpos($phpinfo, 'Suhosin')) {
if (extension_loaded('suhosin')) {
$this->addPhpIniRequirement(
'suhosin.executor.include.whitelist',
create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'),
......
composer.lock
View file @ 1dffff88
......@@ -3,22 +3,22 @@
"packages": [
{
"name": "doctrine/common",
"version": "2.3.0-RC2",
"version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common",
"reference": "2.3.0-RC2"
"reference": "2.3.0"
},
"dist": {
"type": "zip",
"url": "https://github.com/doctrine/common/zipball/2.3.0-RC2",
"reference": "2.3.0-RC2",
"url": "https://github.com/doctrine/common/zipball/2.3.0",
"reference": "2.3.0",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"time": "2012-08-29 10:06:32",
"time": "2012-09-20 05:55:18",
"type": "library",
"extra": {
"branch-alias": {
......@@ -53,9 +53,9 @@
"email": "kontakt@beberlei.de"
},
{
"name": "Johannes M. Schmitt",
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "https://github.com/schmittjoh",
"homepage": "http://jmsyst.com",
"role": "Developer of wrapped JMSSerializerBundle"
}
],
......@@ -75,18 +75,18 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/data-fixtures.git",
"reference": "cd03a6dee6f5ca1c680f2066b32c92320f3421d7"
"reference": "b29bad9738fada9486961f60542f2d2d77c7b501"
},
"dist": {
"type": "zip",
"url": "https://github.com/doctrine/data-fixtures/zipball/cd03a6dee6f5ca1c680f2066b32c92320f3421d7",
"reference": "cd03a6dee6f5ca1c680f2066b32c92320f3421d7",
"url": "https://github.com/doctrine/data-fixtures/zipball/b29bad9738fada9486961f60542f2d2d77c7b501",
"reference": "b29bad9738fada9486961f60542f2d2d77c7b501",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"time": "1347929044",
"time": "1348136794",
"type": "library",
"installation-source": "source",
"autoload": {
......@@ -112,23 +112,23 @@
},
{
"name": "doctrine/dbal",
"version": "2.3.0-RC3",
"version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal",
"reference": "2.3.0-RC3"
"reference": "2.3.0"
},
"dist": {
"type": "zip",
"url": "https://github.com/doctrine/dbal/zipball/2.3.0-RC3",
"reference": "2.3.0-RC3",
"url": "https://github.com/doctrine/dbal/zipball/2.3.0",
"reference": "2.3.0",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"doctrine/common": "2.3.*"
},
"time": "2012-09-05 13:36:29",
"time": "2012-09-20 05:56:37",
"type": "library",
"extra": {
"branch-alias": {
......@@ -295,16 +295,16 @@
},
{
"name": "doctrine/orm",
"version": "2.3.0-RC3",
"version": "2.3.0",
"source": {
"type": "git",
"url": "git://github.com/doctrine/doctrine2.git",
"reference": "2.3.0-RC3"
"reference": "2.3.0"
},
"dist": {
"type": "zip",
"url": "https://github.com/doctrine/doctrine2/zipball/2.3.0-RC3",
"reference": "2.3.0-RC3",
"url": "https://github.com/doctrine/doctrine2/zipball/2.3.0",
"reference": "2.3.0",
"shasum": ""
},
"require": {
......@@ -316,7 +316,7 @@
"suggest": {
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
},
"time": "2012-09-05 14:16:47",
"time": "2012-09-20 06:03:34",
"bin": [
"bin/doctrine",
"bin/doctrine.php"
......@@ -449,25 +449,40 @@
},
{
"name": "jms/di-extra-bundle",
"version": "1.1.0",
"version": "1.1.1",
"target-dir": "JMS/DiExtraBundle",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/JMSDiExtraBundle",
"reference": "1.1.0"
"reference": "1.1.1"
},
"dist": {
"type": "zip",
"url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/1.1.0",
"reference": "1.1.0",
"url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/1.1.1",
"reference": "1.1.1",
"shasum": ""
},
"require": {
"symfony/framework-bundle": "2.1.*",
"symfony/process": "2.1.*",
"symfony/finder": "2.1.*",
"jms/aop-bundle": "1.0.*",
"jms/metadata": "1.1.*"
},
"time": "2012-09-06 12:07:54",
"require-dev": {
"symfony/validator": "*",
"symfony/form": "*",
"symfony/class-loader": "*",
"symfony/yaml": "*",
"symfony/browser-kit": "*",
"symfony/security-bundle": "*",
"symfony/twig-bundle": "*",
"sensio/framework-extra-bundle": "*",
"jms/security-extra-bundle": "1.*",
"doctrine/doctrine-bundle": "*",
"doctrine/orm": "*"
},
"time": "2012-09-21 08:56:32",
"type": "symfony-bundle",
"installation-source": "dist",
"autoload": {
......@@ -721,23 +736,23 @@
},
{
"name": "sensio/distribution-bundle",
"version": "v2.1.0",
"version": "v2.1.1",
"target-dir": "Sensio/Bundle/DistributionBundle",
"source": {
"type": "git",
"url": "https://github.com/sensio/SensioDistributionBundle",
"reference": "v2.1.0"
"reference": "v2.1.1"
},
"dist": {
"type": "zip",
"url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.0",
"reference": "v2.1.0",
"url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.1",
"reference": "v2.1.1",
"shasum": ""
},
"require": {
"symfony/framework-bundle": "2.1.*"
},
"time": "2012-09-05 11:32:12",
"time": "2012-09-11 05:10:08",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
......@@ -1082,16 +1097,16 @@
},
{
"name": "symfony/symfony",
"version": "v2.1.1",
"version": "v2.1.2",
"source": {
"type": "git",
"url": "git://github.com/symfony/symfony.git",
"reference": "v2.1.1"
"reference": "v2.1.2"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/symfony/zipball/v2.1.1",
"reference": "v2.1.1",
"url": "https://github.com/symfony/symfony/zipball/v2.1.2",
"reference": "v2.1.2",
"shasum": ""
},
"require": {
......@@ -1140,7 +1155,7 @@
"propel/propel1": "dev-master",
"monolog/monolog": "dev-master"
},
"time": "2012-09-11 01:00:41",
"time": "2012-09-20 07:13:00",
"type": "library",
"extra": {
"branch-alias": {
......
src/Jity/HomepageBundle/Controller/DefaultController.php
View file @ 1dffff88
......@@ -13,6 +13,7 @@ use Jity\HomepageBundle\JityHomepageBundle;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Jity\HomepageBundle\Entity\Contact;
use Jity\HomepageBundle\Form\ContactType;
use Symfony\Component\HttpFoundation\Response;
/**
* DefaultController
......@@ -80,6 +81,21 @@ class DefaultController extends Controller
));
}
/**
* overallProcessAction
*
* @access public
* @return void
*/
public function overallProcessAction()
{
$this->get('session')->getFlashBag()->add('error',
'Achtung, diese Seite befindet sich zur Zeit noch in der Entwicklung.'
);
return new Response();
}
/**
* showPageAction
*
......
src/Jity/HomepageBundle/EventListener/ControllerListener.php
View file @ 1dffff88
......@@ -29,13 +29,13 @@ class ControllerListener
// Get controller object for further processing
$controller = $event->getController();
if ($controller[0] instanceof Controller) {
// if ($controller[0] instanceof Controller) {
// Add a default flash message
$controller[0]->get('session')->getFlashBag()->add('error',
'Achtung, diese Seite befindet sich zur Zeit noch in der Entwicklung.'
);
}
// // Add a default flash message
// $controller[0]->get('session')->getFlashBag()->add('error',
// 'Achtung, diese Seite befindet sich zur Zeit noch in der Entwicklung.'
// );
// }
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment