Skip to content

Commit

Permalink
Merge pull request #795 from MLoureiro/add_rest_bundle_contenttypegro…
Browse files Browse the repository at this point in the history 
…up_services

EZP-22562 - Create missing value object visitors services
  • Loading branch information
@andrerom
andrerom committed Apr 17, 2014
2 parents dd8ef8f + ec13828 commit 8da87ea
Show file tree
Hide file tree
Showing 19 changed files with 441 additions and 141 deletions.
287 changes: 278 additions & 9 deletions eZ/Bundle/EzPublishRestBundle/Resources/config/input_parsers.yml
View file

Large diffs are not rendered by default.

138 changes: 137 additions & 1 deletion eZ/Bundle/EzPublishRestBundle/Resources/config/value_object_visitors.yml
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions eZ/Publish/Core/REST/Client/Input/Parser/Content.php
View file
Expand Up @@ -10,7 +10,7 @@
namespace eZ\Publish\Core\REST\Client\Input\Parser;

use eZ\Publish\Core\REST\Common\Input\ParserTools;
use eZ\Publish\Core\REST\Client\ContentService;
use eZ\Publish\API\Repository\ContentService;
use eZ\Publish\Core\REST\Common\Input\BaseParser;
use eZ\Publish\Core\REST\Common\Input\FieldTypeParser;
use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher;
Expand Down Expand Up @@ -38,7 +38,7 @@ class Content extends BaseParser
protected $parserTools;

/**
* @var \eZ\Publish\Core\REST\Client\ContentService
* @var \eZ\Publish\API\Repository\ContentService
*/
protected $contentService;

Expand All @@ -49,7 +49,7 @@ class Content extends BaseParser

/**
* @param \eZ\Publish\Core\REST\Common\Input\ParserTools $parserTools
* @param \eZ\Publish\Core\REST\Client\ContentService $contentService
* @param \eZ\Publish\API\Repository\ContentService $contentService
* @param \eZ\Publish\Core\REST\Client\Input\Parser\VersionInfo $versionInfoParser
* @param \eZ\Publish\Core\REST\Common\Input\FieldTypeParser $fieldTypeParser
*/
Expand Down
6 changes: 3 additions & 3 deletions eZ/Publish/Core/REST/Client/Input/Parser/ContentInfo.php
View file
Expand Up @@ -10,10 +10,10 @@
namespace eZ\Publish\Core\REST\Client\Input\Parser;

use eZ\Publish\Core\REST\Common\Input\ParserTools;
use eZ\Publish\Core\REST\Client\ContentTypeService;
use eZ\Publish\Core\REST\Common\Input\BaseParser;
use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher;
use eZ\Publish\Core\REST\Client\Values;
use eZ\Publish\API\Repository\ContentTypeService;

/**
* Parser for ContentInfo
Expand All @@ -26,13 +26,13 @@ class ContentInfo extends BaseParser
protected $parserTools;

/**
* @var \eZ\Publish\Core\REST\Client\ContentTypeService
* @var \eZ\Publish\API\Repository\ContentTypeService
*/
protected $contentTypeService;

/**
* @param \eZ\Publish\Core\REST\Common\Input\ParserTools $parserTools
* @param \eZ\Publish\Core\REST\Client\ContentTypeService $contentTypeService
* @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
*/
public function __construct( ParserTools $parserTools, ContentTypeService $contentTypeService )
{
Expand Down
42 changes: 0 additions & 42 deletions eZ/Publish/Core/REST/Client/Input/Parser/ContentObjectStates.php
View file

This file was deleted.

6 changes: 3 additions & 3 deletions eZ/Publish/Core/REST/Client/Input/Parser/ContentType.php
View file
Expand Up @@ -10,10 +10,10 @@
namespace eZ\Publish\Core\REST\Client\Input\Parser;

use eZ\Publish\Core\REST\Common\Input\ParserTools;
use eZ\Publish\Core\REST\Client\ContentTypeService;
use eZ\Publish\Core\REST\Common\Input\BaseParser;
use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher;
use eZ\Publish\Core\REST\Client\Values;
use eZ\Publish\API\Repository\ContentTypeService;

/**
* Parser for ContentType
Expand All @@ -26,13 +26,13 @@ class ContentType extends BaseParser
protected $parserTools;

/**
* @var \eZ\Publish\Core\REST\Client\ContentTypeService
* @var \eZ\Publish\API\Repository\ContentTypeService
*/
protected $contentTypeService;

/**
* @param \eZ\Publish\Core\REST\Common\Input\ParserTools $parserTools
* @param \eZ\Publish\Core\REST\Client\ContentTypeService $contentTypeService
* @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
*/
public function __construct( ParserTools $parserTools, ContentTypeService $contentTypeService )
{
Expand Down
6 changes: 3 additions & 3 deletions eZ/Publish/Core/REST/Client/Input/Parser/ContentTypeGroupRefList.php
View file
Expand Up @@ -10,10 +10,10 @@
namespace eZ\Publish\Core\REST\Client\Input\Parser;

use eZ\Publish\Core\REST\Common\Input\ParserTools;
use eZ\Publish\Core\REST\Client\ContentTypeService;
use eZ\Publish\Core\REST\Common\Input\BaseParser;
use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher;
use eZ\Publish\Core\REST\Client\Values;
use eZ\Publish\API\Repository\ContentTypeService;

/**
* Parser for ContentTypeGroupRefList
Expand All @@ -26,13 +26,13 @@ class ContentTypeGroupRefList extends BaseParser
protected $parserTools;

/**
* @var \eZ\Publish\Core\REST\Client\ContentTypeService
* @var \eZ\Publish\API\Repository\ContentTypeService
*/
protected $contentTypeService;

/**
* @param ParserTools $parserTools
* @param \eZ\Publish\Core\REST\Client\ContentTypeService $contentTypeService
* @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
*/
public function __construct( ParserTools $parserTools, ContentTypeService $contentTypeService )
{
Expand Down
1 change: 1 addition & 0 deletions eZ/Publish/Core/REST/Client/Input/Parser/ErrorMessage.php
View file
Expand Up @@ -6,6 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
* @version //autogentag//
*/

namespace eZ\Publish\Core\REST\Client\Input\Parser;

use eZ\Publish\Core\REST\Common\Input\BaseParser;
Expand Down
6 changes: 3 additions & 3 deletions eZ/Publish/Core/REST/Client/Input/Parser/FieldDefinitionList.php
View file
Expand Up @@ -10,10 +10,10 @@
namespace eZ\Publish\Core\REST\Client\Input\Parser;

use eZ\Publish\Core\REST\Common\Input\ParserTools;
use eZ\Publish\Core\REST\Client\ContentTypeService;
use eZ\Publish\Core\REST\Common\Input\BaseParser;
use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher;
use eZ\Publish\Core\REST\Client\Values;
use eZ\Publish\API\Repository\ContentTypeService;

/**
* Parser for FieldDefinitionList
Expand All @@ -26,13 +26,13 @@ class FieldDefinitionList extends BaseParser
protected $parserTools;

/**
* @var \eZ\Publish\Core\REST\Client\ContentTypeService
* @var \eZ\Publish\API\Repository\ContentTypeService
*/
protected $contentTypeService;

/**
* @param \eZ\Publish\Core\REST\Common\Input\ParserTools $parserTools
* @param \eZ\Publish\Core\REST\Client\ContentTypeService $contentTypeService
* @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
*/
public function __construct( ParserTools $parserTools, ContentTypeService $contentTypeService )
{
Expand Down
4 changes: 2 additions & 2 deletions eZ/Publish/Core/REST/Client/Input/Parser/Relation.php
View file
Expand Up @@ -12,7 +12,7 @@
use eZ\Publish\Core\REST\Common\Input\BaseParser;
use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher;
use eZ\Publish\Core\REST\Client\Values;
use eZ\Publish\Core\REST\Client\ContentService;
use eZ\Publish\API\Repository\ContentService;

/**
* Parser for Relation
Expand All @@ -27,7 +27,7 @@ class Relation extends BaseParser
protected $contentService;

/**
* @param \eZ\Publish\Core\REST\Input\ContentService $contentService
* @param \eZ\Publish\API\Repository\ContentService $contentService
*/
public function __construct( ContentService $contentService )
{
Expand Down
1 change: 0 additions & 1 deletion eZ/Publish/Core/REST/Client/Input/Parser/Role.php
View file
Expand Up @@ -11,7 +11,6 @@

use eZ\Publish\Core\REST\Common\Input\BaseParser;
use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher;

use eZ\Publish\Core\REST\Client;

/**
Expand Down
1 change: 0 additions & 1 deletion eZ/Publish/Core/REST/Client/Input/Parser/RoleAssignment.php
View file
Expand Up @@ -12,7 +12,6 @@
use eZ\Publish\Core\REST\Common\Input\BaseParser;
use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher;
use eZ\Publish\API\Repository\Values\User\Limitation as APILimitation;

use eZ\Publish\Core\REST\Client;

/**
Expand Down
4 changes: 2 additions & 2 deletions eZ/Publish/Core/REST/Client/Input/Parser/VersionInfo.php
View file
Expand Up @@ -13,7 +13,7 @@
use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher;
use eZ\Publish\Core\REST\Common\Input\ParserTools;
use eZ\Publish\Core\REST\Client\Values;
use eZ\Publish\Core\REST\Client\ContentService;
use eZ\Publish\API\Repository\ContentService;

/**
* Parser for VersionInfo
Expand All @@ -34,7 +34,7 @@ class VersionInfo extends BaseParser

/**
* @param \eZ\Publish\Core\REST\Common\Input\ParserTools $parserTools
* @param \eZ\Publish\Core\REST\Client\ContentService $contentService
* @param \eZ\Publish\API\Repository\ContentService $contentService
*/
public function __construct( ParserTools $parserTools, ContentService $contentService )
{
Expand Down
4 changes: 1 addition & 3 deletions eZ/Publish/Core/REST/Client/Output/ValueObjectVisitor/FieldDefinitionCreateStruct.php
View file
Expand Up @@ -9,7 +9,6 @@

namespace eZ\Publish\Core\REST\Client\Output\ValueObjectVisitor;

use eZ\Publish\Core\REST\Common\RequestParser;
use eZ\Publish\Core\REST\Common\Output\FieldTypeSerializer;
use eZ\Publish\Core\REST\Common\Output\ValueObjectVisitor;
use eZ\Publish\Core\REST\Common\Output\Generator;
Expand All @@ -29,9 +28,8 @@ class FieldDefinitionCreateStruct extends ValueObjectVisitor
* @param \eZ\Publish\Core\REST\Common\RequestParser $requestParser
* @param \eZ\Publish\Core\REST\Common\Output\FieldTypeSerializer $fieldTypeSerializer
*/
public function __construct( RequestParser $requestParser, FieldTypeSerializer $fieldTypeSerializer )
public function __construct( FieldTypeSerializer $fieldTypeSerializer )
{
parent::__construct( $requestParser );
$this->fieldTypeSerializer = $fieldTypeSerializer;
}

Expand Down
60 changes: 0 additions & 60 deletions ...ore/REST/Client/Output/ValueObjectVisitor/SectionIncludingContentMetadataUpdateStruct.php
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...rver/Input/Parser/ContentObjectStates.php → ...mmon/Input/Parser/ContentObjectStates.php
View file
Expand Up @@ -7,7 +7,7 @@
* @version //autogentag//
*/

namespace eZ\Publish\Core\REST\Server\Input\Parser;
namespace eZ\Publish\Core\REST\Common\Input\Parser;

use eZ\Publish\Core\REST\Common\Input\BaseParser;
use eZ\Publish\Core\REST\Common\Input\ParsingDispatcher;
Expand Down
2 changes: 1 addition & 1 deletion ...alueObjectVisitor/ContentObjectStates.php → ...alueObjectVisitor/ContentObjectStates.php
View file
Expand Up @@ -7,7 +7,7 @@
* @version //autogentag//
*/

namespace eZ\Publish\Core\REST\Server\Output\ValueObjectVisitor;
namespace eZ\Publish\Core\REST\Common\Output\ValueObjectVisitor;

use eZ\Publish\Core\REST\Common\Output\ValueObjectVisitor;
use eZ\Publish\Core\REST\Common\Output\Generator;
Expand Down
4 changes: 2 additions & 2 deletions eZ/Publish/Core/REST/Server/Tests/Input/Parser/ContentObjectStatesTest.php
View file
Expand Up @@ -9,7 +9,7 @@

namespace eZ\Publish\Core\REST\Server\Tests\Input\Parser;

use eZ\Publish\Core\REST\Server\Input\Parser;
use eZ\Publish\Core\REST\Common\Input\Parser;

class ContentObjectStatesTest extends BaseTest
{
Expand Down Expand Up @@ -97,7 +97,7 @@ public function getParseHrefExpectationsMap()
/**
* Gets the ContentObjectStates parser
*
* @return \eZ\Publish\Core\REST\Server\Input\Parser\ContentObjectStates;
* @return \eZ\Publish\Core\REST\Common\Input\Parser\ContentObjectStates;
*/
protected function internalGetParser()
{
Expand Down
2 changes: 1 addition & 1 deletion eZ/Publish/Core/REST/Server/Tests/Output/ValueObjectVisitor/ContentObjectStatesTest.php
View file
Expand Up @@ -11,7 +11,7 @@

use eZ\Publish\Core\REST\Common\Tests\Output\ValueObjectVisitorBaseTest;

use eZ\Publish\Core\REST\Server\Output\ValueObjectVisitor;
use eZ\Publish\Core\REST\Common\Output\ValueObjectVisitor;
use eZ\Publish\Core\REST\Common\Values\ContentObjectStates;
use eZ\Publish\Core\REST\Common;

Expand Down

0 comments on commit 8da87ea

Please sign in to comment.