Skip to content

Commit

Permalink
Actualizando a la versión 2.1.0 de Symfony
Browse files Browse the repository at this point in the history
  • Loading branch information
Osukaru committed Oct 2, 2011
1 parent 4016a13 commit 97feba9
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -3,7 +3,7 @@
/app/cache/*
/app/logs/*
/vendor/
/app/config/parameters.ini
/app/config/parameters.yml
/app/phpunit.xml
/phpunit-report/
#Si trabajamos con netbeans quitamos el directorio de proyecto
Expand Down
2 changes: 1 addition & 1 deletion app/config/config.yml
@@ -1,5 +1,5 @@
imports:
- { resource: parameters.ini }
- { resource: parameters.yml }
- { resource: security.yml }
- { resource: "@SFMWebsiteBundle/Resources/config/menu.xml" }
- { resource: @BloggerBlogBundle/Resources/config/config.yml }
Expand Down
19 changes: 0 additions & 19 deletions app/config/parameters.ini.dist

This file was deleted.

13 changes: 13 additions & 0 deletions app/config/parameters.yml.dist
@@ -0,0 +1,13 @@
parameters:
database_driver: pdo_mysql
database_host: localhost
database_port: '1111'
database_name: symfonyaaa
database_user: root
database_password: null
mailer_transport: smtp
mailer_host: localhost
mailer_user: null
mailer_password: null
locale: en
secret: ee71517c5016eb25c8cc5108625f5d622
18 changes: 9 additions & 9 deletions deps
@@ -1,41 +1,40 @@
[symfony]
git=http://github.com/symfony/symfony.git
version=v2.0.1

[twig]
git=http://github.com/fabpot/Twig.git
version=v1.1.2
version=v1.2.0

[monolog]
git=http://github.com/Seldaek/monolog.git
version=1.0.1

[doctrine-common]
git=http://github.com/doctrine/common.git
version=2.1.1
version=origin/2.1.x

[doctrine-dbal]
git=http://github.com/doctrine/dbal.git
version=2.1.1
version=origin/2.1.x

[doctrine]
git=http://github.com/doctrine/doctrine2.git
version=2.1.1
version=origin/2.1.x

[swiftmailer]
git=http://github.com/swiftmailer/swiftmailer.git
version=v4.1.1
version=v4.1.2

[assetic]
git=http://github.com/kriswallsmith/assetic.git
version=v1.0.1
version=v1.0.2

[twig-extensions]
git=http://github.com/fabpot/Twig-extensions.git

[metadata]
git=http://github.com/schmittjoh/metadata.git
version=1.0.0
version=origin/1.0.x

[SensioFrameworkExtraBundle]
git=http://github.com/sensio/SensioFrameworkExtraBundle.git
Expand All @@ -44,6 +43,7 @@
[JMSSecurityExtraBundle]
git=http://github.com/schmittjoh/JMSSecurityExtraBundle.git
target=/bundles/JMS/SecurityExtraBundle
version=origin/1.0.x

[SensioDistributionBundle]
git=http://github.com/sensio/SensioDistributionBundle.git
Expand All @@ -56,7 +56,7 @@
[AsseticBundle]
git=http://github.com/symfony/AsseticBundle.git
target=/bundles/Symfony/Bundle/AsseticBundle
version=v1.0.0
version=v1.0.1

[gherkin]
git=https://github.com/Behat/Gherkin.git
Expand Down
25 changes: 13 additions & 12 deletions deps.lock
@@ -1,18 +1,19 @@
symfony 7cb402d806a9615cf8bcafcfd049da00914b45f8
twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5
symfony 1467bdb86837e132891dd1b5605248a736cca5fe
twig 4a5057997d6d3ffacb2dad1550972a244d459ab8
monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2
doctrine-common 174111c8d245d560e1af4c7455b730347f85686d
doctrine-dbal 54f474b3c321676ceadbe4288396902405d87756
doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5
swiftmailer 1f273a7cd466a2dd82e59431dd5ce15f36996688
assetic 3333d371c4511abcdec7bad86e15ac2be3b10f03
doctrine-common 2913bcf6cf5a39fba49b4de07650510a56612929
doctrine-dbal 17005ec6a0d1c6647597c37749a1087807e12c83
doctrine 623ab9cee97b99188f0b5bb671ef8e2618485bf5
swiftmailer 8c3165691e36302405926abbae7526549db8b899
assetic f829ad23d23c87480151a21faad49fefe7c09e5d
twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54
metadata 8717ad2a5689480765d9ffafe925cd8a2457e582
metadata 014d200714030996ae8ea26a7ccaccf86fc89734
SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17
JMSSecurityExtraBundle facedd50988b311f778288ea3b5e070591936f30
SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870
SensioGeneratorBundle 52038c005d565a1bd4986dcdef207ed9f1246b32
AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10
JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538
SensioDistributionBundle a186b53154bc137a65802ef567e4a2eee2082d21
SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4
AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16

MenuBundle e5d9c865ea7375abd6dbd251d47fc016597053ac
gherkin ebf711c78542c83a98c65d1ab0ce8002afd616e5
behat e1652097725dd917a47d34d352517ad2493d151a
Expand Down

0 comments on commit 97feba9

Please sign in to comment.