Fixed failures in integration tests caused by d04bb24

ezsystems · Apr 16, 2012 · d7faaff · d7faaff
1 parent dde6b99
commit d7faaff
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/eZ/Publish/API/Repository/Tests/Stubs/UserServiceStub.php b/eZ/Publish/API/Repository/Tests/Stubs/UserServiceStub.php
@@ -106,7 +106,6 @@ public function createUserGroup( UserGroupCreateStruct $userGroupCreateStruct, U
 
         $userGroup = new UserGroupStub(
             array(
-                'id'             =>  $content->id,
                 'parentId'       =>  $parentGroup->id,
                 'subGroupCount'  =>  0,
                 'content'        =>  $content
@@ -115,7 +114,6 @@ public function createUserGroup( UserGroupCreateStruct $userGroupCreateStruct, U
         $this->userGroups[$userGroup->id]   = $userGroup;
         $this->userGroups[$parentGroup->id] = new UserGroupStub(
             array(
-                'id'             =>  $parentGroup->id,
                 'parentId'       =>  $parentGroup->parentId,
                 'subGroupCount'  =>  $parentGroup->subGroupCount + 1,
                 'content'        =>  $parentGroup->content
@@ -296,7 +294,6 @@ public function updateUserGroup( UserGroup $userGroup, UserGroupUpdateStruct $us
         {
             $this->userGroups[$userGroup->id] = new UserGroupStub(
                 array(
-                    'id'             =>  $userGroup->id,
                     'parentId'       =>  $userGroup->parentId,
                     'subGroupCount'  =>  $userGroup->subGroupCount,
                     'content'        =>  $content
@@ -354,7 +351,6 @@ public function createUser( UserCreateStruct $userCreateStruct, array $parentGro
 
         $user = new UserStub(
             array(
-                'id'             =>  $content->id,
                 'login'          =>  $userCreateStruct->login,
                 'email'          =>  $userCreateStruct->email,
                 'passwordHash'   =>  $this->createHash(
@@ -508,7 +504,6 @@ public function updateUser( User $user, UserUpdateStruct $userUpdateStruct )
 
         $this->users[$user->id] = new UserStub(
             array(
-                'id'             =>  $user->id,
                 'login'          =>  $user->login,
                 'email'          =>  $userUpdateStruct->email ?: $user->email,
                 'isEnabled'      =>  is_null( $userUpdateStruct->isEnabled ) ? $user->isEnabled : $userUpdateStruct->isEnabled,

diff --git a/eZ/Publish/API/Repository/Tests/_fixtures/UserFixture.php b/eZ/Publish/API/Repository/Tests/_fixtures/UserFixture.php
@@ -3,7 +3,6 @@
     array(
         10  =>  new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserStub(
             array(
-                "id"  =>  10,
                 "login"  =>  "anonymous",
                 "email"  =>  "nospam@ez.no",
                 "passwordHash"  =>  "4e6f6184135228ccd45f8233d72a0363",
@@ -14,7 +13,6 @@
         ),
         14  =>  new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserStub(
             array(
-                "id"  =>  14,
                 "login"  =>  "admin",
                 "email"  =>  "kn@ez.no",
                 "passwordHash"  =>  "c78e3b0f3d9244ed8c6d1c29464bdff9",

diff --git a/eZ/Publish/API/Repository/Tests/_fixtures/UserGroupFixture.php b/eZ/Publish/API/Repository/Tests/_fixtures/UserGroupFixture.php
@@ -3,47 +3,41 @@
     array(
         4  =>  new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
             array(
-                "id"  =>  4,
                 "parentId"  =>  0,
                 "subGroupCount"  =>  5,
                 "content"  =>  $this->getContentService()->loadContent( 4 ),
             )
         ),
         11  =>  new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
             array(
-                "id"  =>  11,
                 "parentId"  =>  4,
                 "subGroupCount"  =>  0,
                 "content"  =>  $this->getContentService()->loadContent( 11 ),
             )
         ),
         12  =>  new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
             array(
-                "id"  =>  12,
                 "parentId"  =>  4,
                 "subGroupCount"  =>  0,
                 "content"  =>  $this->getContentService()->loadContent( 12 ),
             )
         ),
         13  =>  new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
             array(
-                "id"  =>  13,
                 "parentId"  =>  4,
                 "subGroupCount"  =>  0,
                 "content"  =>  $this->getContentService()->loadContent( 13 ),
             )
         ),
         42  =>  new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
             array(
-                "id"  =>  42,
                 "parentId"  =>  4,
                 "subGroupCount"  =>  0,
                 "content"  =>  $this->getContentService()->loadContent( 42 ),
             )
         ),
         225  =>  new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
             array(
-                "id"  =>  225,
                 "parentId"  =>  4,
                 "subGroupCount"  =>  0,
                 "content"  =>  $this->getContentService()->loadContent( 225 ),

diff --git a/eZ/Publish/API/Repository/Tests/common.php b/eZ/Publish/API/Repository/Tests/common.php
@@ -19,10 +19,9 @@
 $repository->setCurrentUser(
     new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserStub(
         array(
-            'id' => 14,
             'content'  =>  new \eZ\Publish\API\Repository\Tests\Stubs\Values\Content\ContentStub(
                 array(
-                    'contentId' => 14
+                    'id' => 14
                 )
             )
         )