Skip to content
Browse files

Cleanups

  • Loading branch information...
1 parent a87ff9a commit c80b7a3d928aab83d4331d661a45769ee42746ab @Seldaek Seldaek committed
Showing with 15 additions and 17 deletions.
  1. +1 −5 app/autoload.php
  2. +2 −4 composer.json
  3. +12 −8 composer.lock
View
6 app/autoload.php
@@ -24,10 +24,7 @@
if (!function_exists('intl_get_error_code')) {
require_once __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs/functions.php';
- $loader->add('IntlDateFormatter', __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs');
- $loader->add('Collator', __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs');
- $loader->add('Locale', __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs');
- $loader->add('NumberFormatter', __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs');
+ $loader->add('', __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs');
}
if (!interface_exists('SessionHandlerInterface', false)) {
@@ -38,7 +35,6 @@
$loader->loadClass($class);
return class_exists($class, false);
});
-AnnotationRegistry::registerFile(__DIR__.'/../vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
// Swiftmailer needs a special autoloader to allow
// the lazy loading of the init file (which is expensive)
View
6 composer.json
@@ -5,8 +5,7 @@
"require": {
"php": ">=5.3.2",
"symfony/symfony": "2.1.0-dev",
- "doctrine/dbal": "master-dev",
- "doctrine/orm": "master-dev",
+ "doctrine/orm": "2.2.0",
"doctrine/doctrine-bundle": "master-dev",
"twig/extensions": "master-dev",
"symfony/assetic-bundle": "2.1.0-dev",
@@ -15,8 +14,7 @@
"sensio/distribution-bundle": "master-dev",
"sensio/framework-extra-bundle": "master-dev",
"sensio/generator-bundle": "master-dev",
- "jms/security-extra-bundle": "master-dev",
- "jms/metadata": "master-dev"
+ "jms/security-extra-bundle": "master-dev"
},
"scripts": {
"post-install-cmd": [
View
20 composer.lock
@@ -1,7 +1,15 @@
{
- "hash": "92e6d0b9c1eab4b0a1750d37303188cd",
+ "hash": "7a061167f0b3ee8bda205c519fc5bd94",
"packages": [
{
+ "package": "swiftmailer\/swiftmailer",
+ "version": "4.1.6-dev"
+ },
+ {
+ "package": "twig\/twig",
+ "version": "1.7.0-dev"
+ },
+ {
"package": "jms\/cg",
"version": "1.0.0"
},
@@ -23,11 +31,7 @@
},
{
"package": "doctrine\/common",
- "version": "master-dev"
- },
- {
- "package": "jms\/metadata",
- "version": "master-dev"
+ "version": "2.2.0"
},
{
"package": "jms\/security-extra-bundle",
@@ -67,11 +71,11 @@
},
{
"package": "doctrine\/orm",
- "version": "master-dev"
+ "version": "2.2.0"
},
{
"package": "doctrine\/dbal",
- "version": "master-dev"
+ "version": "2.2.1"
},
{
"package": "symfony\/symfony",

0 comments on commit c80b7a3

Please sign in to comment.
Something went wrong with that request. Please try again.