diff options
Diffstat (limited to 'dev-php')
| -rw-r--r-- | dev-php/symfony-config/Manifest | 2 | ||||
| -rw-r--r-- | dev-php/symfony-config/files/autoload.php | 9 | ||||
| -rw-r--r-- | dev-php/symfony-config/symfony-config-2.8.19.ebuild (renamed from dev-php/symfony-config/symfony-config-2.8.15-r1.ebuild) | 10 |
3 files changed, 15 insertions, 6 deletions
diff --git a/dev-php/symfony-config/Manifest b/dev-php/symfony-config/Manifest index b4ebc338c463..2ac1c0770ec1 100644 --- a/dev-php/symfony-config/Manifest +++ b/dev-php/symfony-config/Manifest @@ -1 +1 @@ -DIST symfony-config-2.8.15.tar.gz 51013 SHA256 75b0a514b92f86e8721bd3e6c313ca1b6c095a372356b8df8f38e39a67a5e1e3 SHA512 96ae8b84d97b5ce79b7eee589de0423ee998ae00e5f1d5cb25befa92e605903b9f8aabb99b9afbc100891d9399f2c9cf59d63be559644bb8531b050fab817538 WHIRLPOOL c8629dd77c5d8f2b0455939f1f6514fa1f7e694e2fa740d142f00352727a443921adb3e0d504f145efa40e6ee3928cb808dd1313bee6892378cee491acb33384 +DIST symfony-config-2.8.19.tar.gz 52568 SHA256 0804dde6ea36afe5f428f838288e22bb8e02e123b970f2ae2f3fef1f18f0f294 SHA512 00d89ec1c78245429652ed48639fe54188c9cafcb7d3cc7978054d26d2e6be44addc738750575a134644b7b9735e805e95cb2890e9c4063dc7359e3b12da6942 WHIRLPOOL eae0fae487163864017097c3172ae151617818ed363618f0df66b12e4d371240609e39ed4446cf5a94da99a08ed8d0120677fd71d3e49a7f55502a41ad055bfb diff --git a/dev-php/symfony-config/files/autoload.php b/dev-php/symfony-config/files/autoload.php index 5ebdb7126c25..4cbfc168d793 100644 --- a/dev-php/symfony-config/files/autoload.php +++ b/dev-php/symfony-config/files/autoload.php @@ -1,8 +1,15 @@ <?php /* Autoloader for dev-php/symfony-config and its dependencies */ +$vendor_dir = '/usr/share/php'; + if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; + require_once("${vendor_dir}/Fedora/Autoloader/autoload.php"); } \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Config\\', __DIR__); + +// Dependencies +\Fedora\Autoloader\Dependencies::required(array( + "${vendor_dir}/Symfony/Component/Filesystem/autoload.php" +)); diff --git a/dev-php/symfony-config/symfony-config-2.8.15-r1.ebuild b/dev-php/symfony-config/symfony-config-2.8.19.ebuild index cd3274c4c2bd..b53316b5174d 100644 --- a/dev-php/symfony-config/symfony-config-2.8.15-r1.ebuild +++ b/dev-php/symfony-config/symfony-config-2.8.19.ebuild @@ -12,20 +12,22 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" +# This needs a newer phpunit and a modified autoload.php but should work. +RESTRICT=test + RDEPEND=" dev-lang/php:* dev-php/fedora-autoloader dev-php/symfony-filesystem" -DEPEND=" - test? ( - ${RDEPEND} - dev-php/phpunit )" +DEPEND="test? ( ${RDEPEND} dev-php/phpunit )" S="${WORKDIR}/config-${PV}" src_prepare() { default if use test; then + # Not quite right: we need to include PHPUnit's autoload.php as + # part of ours for the test suite to work. cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die fi } |