From 9fcad65c36ebe75b9208bbf25c4d90db6c4d8014 Mon Sep 17 00:00:00 2001 From: Jordan Stout Date: Fri, 14 Oct 2011 16:25:07 -0700 Subject: [PATCH] Changed isset to !empty --- .../Factory/AclAwareAmazonS3AdapterFactory.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DependencyInjection/Factory/AclAwareAmazonS3AdapterFactory.php b/DependencyInjection/Factory/AclAwareAmazonS3AdapterFactory.php index f68403a..410cef2 100644 --- a/DependencyInjection/Factory/AclAwareAmazonS3AdapterFactory.php +++ b/DependencyInjection/Factory/AclAwareAmazonS3AdapterFactory.php @@ -61,7 +61,7 @@ class AclAwareAmazonS3AdapterFactory implements AdapterFactoryInterface $builder ->validate() ->always(function($v) { - if (isset($v['acl']) && isset($v['users'])) { + if (!empty($v['acl']) && !empty($v['users'])) { throw new \Exception('"acl", and "users" cannot be set both at the same time.'); } @@ -77,7 +77,7 @@ class AclAwareAmazonS3AdapterFactory implements AdapterFactoryInterface ->prototype('array') ->validate() ->always(function($v) { - if (isset($v['group']) === isset($v['id'])) { + if (!empty($v['group']) === !empty($v['id'])) { throw new \Exception('Either "group", or "id" must be set.'); } @@ -95,4 +95,4 @@ class AclAwareAmazonS3AdapterFactory implements AdapterFactoryInterface ->end() ; } -} \ No newline at end of file +}