Skip to content

Commit

Permalink
BAP-16323: Upgrade minimum required php version to 7.1
Browse files Browse the repository at this point in the history
- fix requirements constant
- remove unused hacks from SecurityBundle
- update UPGRAGE.md file for commerce-ee
  • Loading branch information
bemzaslava committed Jan 15, 2018
1 parent 195f63d commit fe67338
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 241 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ branches:
- /^\d+\.\d+$/

php:
- 7.0
- 7.1

cache:
Expand Down
214 changes: 0 additions & 214 deletions src/Oro/Bundle/SecurityBundle/Acl/Domain/Entry.php

This file was deleted.

18 changes: 0 additions & 18 deletions src/Oro/Bundle/SecurityBundle/OroSecurityBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,6 @@

class OroSecurityBundle extends Bundle
{
/**
* {@inheritdoc}
*/
public function __construct()
{
// Replace original Acl\Domain\Entry on custom class
// to avoid php7 issue with unserialization of the reference object
// https://bugs.php.net/bug.php?id=71940
if (version_compare(PHP_VERSION, '7.0.0', '>=') && version_compare(PHP_VERSION, '7.0.6', '<')
&& !class_exists('Symfony\Component\Security\Acl\Domain\Entry', false)
) {
class_alias(
'Oro\Bundle\SecurityBundle\Acl\Domain\Entry',
'Symfony\Component\Security\Acl\Domain\Entry'
);
}
}

/**
* {@inheritdoc}
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,14 +285,7 @@ public function getFieldsWithVirtualRelationsAndEnumsDataProvider()
]
];

/**
* Changed expected result according to changes
* in user defined sorting algorithm in php7
* https://bugs.php.net/bug.php?id=69158
*/
if (version_compare(PHP_VERSION, '7.0.0') >= 0) {
array_splice($expectedResult[0][0], 0, 2, [ $expectedResult[0][0][1], $expectedResult[0][0][0] ]);
}
array_splice($expectedResult[0][0], 0, 2, [ $expectedResult[0][0][1], $expectedResult[0][0][0] ]);

return $expectedResult;
}
Expand Down

0 comments on commit fe67338

Please sign in to comment.