Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:ezsystems/ezp-next

  • Loading branch information...
commit 03e77f922de6cbe355fa0d7be4fe35a832d3fe7e 2 parents 3d9f404 + c3fd305
Christian Bacher authored
View
5 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,
View
2  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",
View
6 eZ/Publish/API/Repository/Tests/_fixtures/UserGroupFixture.php
@@ -3,7 +3,6 @@
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,7 +10,6 @@
),
11 => new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
array(
- "id" => 11,
"parentId" => 4,
"subGroupCount" => 0,
"content" => $this->getContentService()->loadContent( 11 ),
@@ -19,7 +17,6 @@
),
12 => new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
array(
- "id" => 12,
"parentId" => 4,
"subGroupCount" => 0,
"content" => $this->getContentService()->loadContent( 12 ),
@@ -27,7 +24,6 @@
),
13 => new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
array(
- "id" => 13,
"parentId" => 4,
"subGroupCount" => 0,
"content" => $this->getContentService()->loadContent( 13 ),
@@ -35,7 +31,6 @@
),
42 => new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
array(
- "id" => 42,
"parentId" => 4,
"subGroupCount" => 0,
"content" => $this->getContentService()->loadContent( 42 ),
@@ -43,7 +38,6 @@
),
225 => new \eZ\Publish\API\Repository\Tests\Stubs\Values\User\UserGroupStub(
array(
- "id" => 225,
"parentId" => 4,
"subGroupCount" => 0,
"content" => $this->getContentService()->loadContent( 225 ),
View
3  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
)
)
)
View
8 phpunit.xml
@@ -33,6 +33,14 @@
<directory suffix=".php">eZ/Publish/Core/Persistence/Legacy/Tests</directory>
<directory suffix=".php">eZ/Publish/Core/Io/Tests</directory>
<directory suffix=".php">eZ/Publish/API/Repository/Examples/</directory>
+ <directory suffix=".php">eZ/Publish/API/Repository/Tests/_fixtures</directory>
+ <directory suffix=".php">eZ/Publish/Core/Repository/Tests/Service/Legacy/_fixtures</directory>
+ <directory suffix=".php">eZ/Publish/Core/Persistence/Legacy/Tests/Content/Type/_fixtures</directory>
+ <directory suffix=".php">eZ/Publish/Core/Persistence/Legacy/Tests/Content/Type/Gateway/_fixtures</directory>
+ <directory suffix=".php">eZ/Publish/Core/Persistence/Legacy/Tests/Content/SearchHandler/_fixtures</directory>
+ <directory suffix=".php">eZ/Publish/Core/Persistence/Legacy/Tests/Content/_fixtures</directory>
+ <directory suffix=".php">eZ/Publish/Core/Persistence/Legacy/Tests/Content/Location/Gateway/_fixtures</directory>
+ <directory suffix=".php">eZ/Publish/Core/Persistence/Legacy/Tests/_fixtures</directory>
<directory suffix=".php">doc</directory>
</exclude>
</whitelist>
Please sign in to comment.
Something went wrong with that request. Please try again.