summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitattributes2
-rw-r--r--Acl/Domain/PermissionGrantingStrategy.php6
-rw-r--r--Core/Util/ClassUtils.php5
-rw-r--r--Core/Util/StringUtils.php9
4 files changed, 13 insertions, 9 deletions
diff --git a/.gitattributes b/.gitattributes
index e742c9b..8048151 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-Tests/ export-ignore
+/Tests export-ignore
phpunit.xml.dist export-ignore
diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php
index 1d64df4..e075861 100644
--- a/Acl/Domain/PermissionGrantingStrategy.php
+++ b/Acl/Domain/PermissionGrantingStrategy.php
@@ -121,10 +121,8 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
* permission/identity combination.
*
* This process is repeated until either a granting ACE is found, or no
- * permission/identity combinations are left. In the latter case, we will
- * call this method on the parent ACL if it exists, and isEntriesInheriting
- * is true. Otherwise, we will either throw an NoAceFoundException, or deny
- * access finally.
+ * permission/identity combinations are left. Finally, we will either throw
+ * an NoAceFoundException, or deny access.
*
* @param AclInterface $acl
* @param EntryInterface[] $aces An array of ACE to check against
diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php
index 7b583a3..26bf1a1 100644
--- a/Core/Util/ClassUtils.php
+++ b/Core/Util/ClassUtils.php
@@ -37,6 +37,11 @@ class ClassUtils
const MARKER_LENGTH = 6;
/**
+ * This class should not be instantiated
+ */
+ private function __construct() {}
+
+ /**
* Gets the real class name of a class name that could be a proxy.
*
* @param string|object
diff --git a/Core/Util/StringUtils.php b/Core/Util/StringUtils.php
index a73b471..d21efd3 100644
--- a/Core/Util/StringUtils.php
+++ b/Core/Util/StringUtils.php
@@ -16,11 +16,12 @@ namespace Symfony\Component\Security\Core\Util;
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-final class StringUtils
+class StringUtils
{
- final private function __construct()
- {
- }
+ /**
+ * This class should not be instantiated
+ */
+ private function __construct() {}
/**
* Compares two strings.