Skip to content

added support for silex 2.0-dev #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

added support for silex 2.0-dev #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ddaa20
added support for silex 2.0-dev
Aug 19, 2014
475b66e
renamed variable to $pimple
May 15, 2015
aa35918
removed .idea from .gitignore
May 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
composer.lock
vendor
vendor
4 changes: 2 additions & 2 deletions composer.json
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
],
"require": {
"silex/silex": "~1.0"
"silex/silex": "2.0.x-dev"
},
"require-dev": {
"symfony/yaml": "~2.1",
Expand All @@ -25,7 +25,7 @@
"jamesmoss/toml": "~0.1"
},
"autoload": {
"psr-0": { "Igorw\\Silex": "src" }
"psr-4": { "Igorw\\Silex\\": "src" }
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would keep psr-0 and the existing file structure, might save some pain later.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'am not sure about this, since there is currently no problems at all mixing psr-0 and psr-4

},
"extra": {
"branch-alias": {
Expand Down
Loading