8000 remove obsolete apcu polyfill by Tobion · Pull Request #17519 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

remove obsolete apcu polyfill #17519

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

Merged
merged 1 commit into from
Jan 25, 2016
Merged

remove obsolete apcu polyfill #17519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
"doctrine/common": "~2.4",
"twig/twig": "~1.23|~2.0",
"psr/log": "~1.0",
"symfony/security-acl": "~2.7",
"symfony/polyfill-apcu": "~1.0,>=1.0.2",
"symfony/polyfill-intl-icu": "~1.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was a wrong merge in 67df429#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780
Not sure how we can prevent this from happening again and again.

Copy link
Member

Choose a reason for hiding this comment

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

We can't AFAIK. There is no easy way to automate the knowledge that it should be reverted when merging in 3.0 IMO

Copy link
Contributor

Choose a reason for hiding this comment

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

Merge without commit, then you can change the staged changes and commit (still a merge commit).

"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php56": "~1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use Symfony\Component\ClassLoader\ClassLoader;

/**
* @requires extension apc
* @requires extension apcu
*/
class ApcClassLoaderTest extends \PHPUnit_Framework_TestCase
{
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/ClassLoader/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
],
"minimum-stability": "dev",
"require": {
"php": ">=5.5.9",
"symfony/polyfill-apcu": "~1.0,>=1.0.2"
"php": ">=5.5.9"
},
"require-dev": {
"symfony/finder": "~2.8|~3.0"
Expand Down
0