aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-05-22 03:02:25 +0200
committerTristan Darricau <github@nicofuma.fr>2014-06-14 01:45:25 +0200
commitd4cc6990e48ca4f98e16c717dcdbdf37473312fd (patch)
treee02c8d57a69da4357c774752a33943a3c2af0344
parent6e478862273946a2088ff3b672ef64034473bcf3 (diff)
downloadforums-d4cc6990e48ca4f98e16c717dcdbdf37473312fd.tar
forums-d4cc6990e48ca4f98e16c717dcdbdf37473312fd.tar.gz
forums-d4cc6990e48ca4f98e16c717dcdbdf37473312fd.tar.bz2
forums-d4cc6990e48ca4f98e16c717dcdbdf37473312fd.tar.xz
forums-d4cc6990e48ca4f98e16c717dcdbdf37473312fd.zip
[ticket/12575] Skip sniffer issue triggered by the solution of a php bug
https://bugs.php.net/bug.php?id=66834 https://bugs.php.net/bug.php?id=67067 PHPBB3-12575
-rw-r--r--phpBB/phpbb/di/service_collection.php7
-rw-r--r--phpBB/phpbb/di/service_collection_iterator.php7
2 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/phpbb/di/service_collection.php b/phpBB/phpbb/di/service_collection.php
index 6a2e62a553..ebf933d338 100644
--- a/phpBB/phpbb/di/service_collection.php
+++ b/phpBB/phpbb/di/service_collection.php
@@ -38,6 +38,12 @@ class service_collection extends \ArrayObject
return new service_collection_iterator($this->container, $this);
}
+ // Because of a PHP issue we have to redefine offsetExists
+ // (even <ith a call to the parent):
+ // https://bugs.php.net/bug.php?id=66834
+ // https://bugs.php.net/bug.php?id=67067
+ // But it triggers a sniffer issue that we have to skip
+ // @codingStandardsIgnoreStart
/**
* {@inheritdoc}
*/
@@ -45,6 +51,7 @@ class service_collection extends \ArrayObject
{
return parent::offsetExists($index);
}
+ // @codingStandardsIgnoreEnd
/**
* {@inheritdoc}
diff --git a/phpBB/phpbb/di/service_collection_iterator.php b/phpBB/phpbb/di/service_collection_iterator.php
index a6cb0e6c3e..7870174c08 100644
--- a/phpBB/phpbb/di/service_collection_iterator.php
+++ b/phpBB/phpbb/di/service_collection_iterator.php
@@ -49,6 +49,12 @@ class service_collection_iterator extends \ArrayIterator
return $task;
}
+ // Because of a PHP issue we have to redefine offsetExists
+ // (even <ith a call to the parent):
+ // https://bugs.php.net/bug.php?id=66834
+ // https://bugs.php.net/bug.php?id=67067
+ // But it triggers a sniffer issue that we have to skip
+ // @codingStandardsIgnoreStart
/**
* {@inheritdoc}
*/
@@ -56,6 +62,7 @@ class service_collection_iterator extends \ArrayIterator
{
parent::offsetExists($index);
}
+ // @codingStandardsIgnoreEnd
/**
* {@inheritdoc}