Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merged 2.0

  • Loading branch information...
commit 7000e944fd05446c75fdc35fd811005cbe2fa5c4 2 parents 9d9013d + 208c2e4
Fabien Potencier fabpot authored

Showing 35 changed files with 27 additions and 34 deletions. Show diff stats Hide diff stats

  1. +0 1  composer.json
  2. +1 1  src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
  3. +0 1  src/Symfony/Bridge/Doctrine/composer.json
  4. +0 1  src/Symfony/Bridge/Monolog/composer.json
  5. +0 1  src/Symfony/Bridge/Swiftmailer/composer.json
  6. +0 1  src/Symfony/Bridge/Twig/composer.json
  7. +26 0 src/Symfony/Bundle/DoctrineBundle/composer.json
  8. +0 1  src/Symfony/Bundle/FrameworkBundle/composer.json
  9. +0 1  src/Symfony/Bundle/MonologBundle/composer.json
  10. +0 1  src/Symfony/Bundle/SecurityBundle/composer.json
  11. +0 1  src/Symfony/Bundle/SwiftmailerBundle/composer.json
  12. +0 1  src/Symfony/Bundle/TwigBundle/composer.json
  13. +0 1  src/Symfony/Bundle/WebProfilerBundle/composer.json
  14. +0 1  src/Symfony/Component/BrowserKit/composer.json
  15. +0 1  src/Symfony/Component/ClassLoader/composer.json
  16. +0 1  src/Symfony/Component/Config/composer.json
  17. +0 1  src/Symfony/Component/Console/composer.json
  18. +0 1  src/Symfony/Component/CssSelector/composer.json
  19. +0 1  src/Symfony/Component/DependencyInjection/composer.json
  20. +0 1  src/Symfony/Component/DomCrawler/composer.json
  21. +0 1  src/Symfony/Component/EventDispatcher/composer.json
  22. +0 1  src/Symfony/Component/Filesystem/composer.json
  23. +0 1  src/Symfony/Component/Finder/composer.json
  24. +0 1  src/Symfony/Component/Form/composer.json
  25. +0 1  src/Symfony/Component/HttpFoundation/composer.json
  26. +0 1  src/Symfony/Component/HttpKernel/composer.json
  27. +0 1  src/Symfony/Component/Locale/composer.json
  28. +0 1  src/Symfony/Component/Process/composer.json
  29. +0 1  src/Symfony/Component/Routing/composer.json
  30. +0 1  src/Symfony/Component/Security/composer.json
  31. +0 1  src/Symfony/Component/Serializer/composer.json
  32. +0 1  src/Symfony/Component/Templating/composer.json
  33. +0 1  src/Symfony/Component/Translation/composer.json
  34. +0 1  src/Symfony/Component/Validator/composer.json
  35. +0 1  src/Symfony/Component/Yaml/composer.json
1  composer.json
@@ -4,7 +4,6 @@
4 4 "description": "The Symfony PHP framework",
5 5 "keywords": ["framework"],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
2  src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -88,7 +88,7 @@ public function getName()
88 88 private function sanitizeQueries($queries)
89 89 {
90 90 foreach ($queries as $i => $query) {
91   - foreach ($query['params'] as $j => $param) {
  91 + foreach ((array)$query['params'] as $j => $param) {
92 92 $queries[$i]['params'][$j] = $this->varToString($param);
93 93 }
94 94 }
1  src/Symfony/Bridge/Doctrine/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Doctrine Bridge",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Bridge/Monolog/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Monolog Bridge",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Bridge/Swiftmailer/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Swiftmailer Bridge",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Bridge/Twig/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Twig Bridge",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
26 src/Symfony/Bundle/DoctrineBundle/composer.json
... ... @@ -0,0 +1,26 @@
  1 +{
  2 + "name": "symfony/doctrine-bundle",
  3 + "type": "symfony-bundle",
  4 + "description": "Symfony DoctrineBundle",
  5 + "keywords": [],
  6 + "homepage": "http://symfony.com",
  7 + "license": "MIT",
  8 + "authors": [
  9 + {
  10 + "name": "Fabien Potencier",
  11 + "email": "fabien@symfony.com"
  12 + },
  13 + {
  14 + "name": "Symfony Community",
  15 + "homepage": "http://symfony.com/contributors"
  16 + }
  17 + ],
  18 + "require": {
  19 + "php": ">=5.3.2",
  20 + "symfony/doctrine-bridge": "self.version"
  21 + },
  22 + "autoload": {
  23 + "psr-0": { "Symfony\\Bundle\\DoctrineBundle": "" }
  24 + },
  25 + "target-dir": "Symfony/Bundle/DoctrineBundle"
  26 +}
1  src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony FrameworkBundle",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Bundle/MonologBundle/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony MonologBundle",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Bundle/SecurityBundle/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony SecurityBundle",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Bundle/SwiftmailerBundle/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony SwiftmailerBundle",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Bundle/TwigBundle/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony TwigBundle",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony WebProfilerBundle",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/BrowserKit/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony BrowserKit Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/ClassLoader/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony ClassLoader Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Config/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Config Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Console/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Console Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/CssSelector/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony CssSelector Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/DependencyInjection/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony DependencyInjection Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/DomCrawler/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony DomCrawler Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/EventDispatcher/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony EventDispatcher Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Filesystem/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Filesystem Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Finder/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Finder Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Form/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Form Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/HttpFoundation/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony HttpFoundation Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/HttpKernel/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony HttpKernel Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Locale/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Locale Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Process/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Process Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Routing/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Routing Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Security/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Security Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Serializer/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Serializer Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Templating/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Templating Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Translation/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Translation Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Validator/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Validator Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {
1  src/Symfony/Component/Yaml/composer.json
@@ -4,7 +4,6 @@
4 4 "description": "Symfony Yaml Component",
5 5 "keywords": [],
6 6 "homepage": "http://symfony.com",
7   - "version": "2.1.0",
8 7 "license": "MIT",
9 8 "authors": [
10 9 {

0 comments on commit 7000e94

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