Skip to content

Commit

Permalink
Merge pull request #189 from open-orchestra/remove_deprecated_1.2
Browse files Browse the repository at this point in the history
remove deprecated 1.2
  • Loading branch information
alavieille committed Jun 14, 2016
2 parents 0e33cf1 + 0782205 commit 9269d83
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 334 deletions.
14 changes: 0 additions & 14 deletions ModelInterface/Manager/VersionableSaverInterface.php

This file was deleted.

5 changes: 0 additions & 5 deletions ModelInterface/Model/NodeInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,6 @@ public function setRole($role);
*/
public function setOrder($order);

/**
* @return boolean
*/
public function isEditable();

/**
* @param string $boDirection
*/
Expand Down
53 changes: 0 additions & 53 deletions ModelInterface/Repository/ContentRepositoryInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,6 @@ public function findAll();
*/
public function testUniquenessInContext($name);

/**
* @param string $contentId
* @param string $language
*
* @deprecated will be removed in 1.2.0, use findOneByLanguage
*
* @return ContentInterface|null
*/
public function findOneByContentIdAndLanguage($contentId, $language);

/**
* @param string $contentId
* @param string $language
Expand All @@ -41,16 +31,6 @@ public function findOneByContentIdAndLanguage($contentId, $language);
*/
public function findOneByLanguage($contentId, $language);

/**
* @param string $contentId
* @param string $language
*
* @deprecated will be removed in 1.2.0, use findByLanguage
*
* @return array
*/
public function findByContentIdAndLanguage($contentId, $language);

/**
* @param string $contentId
* @param string $language
Expand All @@ -66,17 +46,6 @@ public function findByLanguage($contentId, $language);
*/
public function findByContentId($contentId);

/**
* @param string $contentId
* @param string $language
* @param int|null $version
*
* @deprecated will be removed in 1.2.0, use findOneByLanguageAndVersion
*
* @return ContentInterface|null
*/
public function findOneByContentIdAndLanguageAndVersion($contentId, $language, $version = null);

/**
* @param string $contentId
* @param string $language
Expand All @@ -86,17 +55,6 @@ public function findOneByContentIdAndLanguageAndVersion($contentId, $language, $
*/
public function findOneByLanguageAndVersion($contentId, $language, $version = null);

/**
* @param string|null $contentType
* @param PaginateFinderConfiguration $configuration
* @param string|null $siteId
*
* @deprecated will be removed in 1.2.0, use findPaginatedLastVersionByContentTypeAndSite
*
* @return array
*/
public function findByContentTypeAndSiteIdInLastVersionForPaginate($contentType = null, PaginateFinderConfiguration $configuration = null, $siteId = null);

/**
* @param string|null $contentType
* @param PaginateFinderConfiguration $configuration
Expand All @@ -121,17 +79,6 @@ public function countByContentTypeInLastVersionWithFilter($contentType = null, F
*/
public function countByContentTypeInLastVersion($contentType = null);

/**
* @param string $author
* @param boolean|null $published
* @param int|null $limit
*
* @return array
*
* @deprecated will be removed in 1.2.0
*/
public function findByAuthor($author, $published = null, $limit = null);

/**
* @param string $author
* @param string $siteId
Expand Down
138 changes: 0 additions & 138 deletions ModelInterface/Repository/NodeRepositoryInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@ interface NodeRepositoryInterface extends ReadNodeRepositoryInterface, Statusabl
*/
public function findAll();

/**
* @param string $entityId
*
* @deprecated will be removed in 1.2.0, use findVersionByDocumentId instead
*
* @return NodeInterface
*/
public function findOneById($entityId);

/**
* @param string $entityId
*
Expand All @@ -37,18 +28,6 @@ public function findVersionByDocumentId($entityId);
*/
public function findOneByNodeId($nodeId);

/**
* @param string $parentId
* @param string $siteId
*
* @throws \Exception
*
* @deprecated will be removed in 1.2.0, use findByParent instead
*
* @return mixed
*/
public function findByParentIdAndSiteId($parentId, $siteId);

/**
* @param string $parentId
* @param string $siteId
Expand Down Expand Up @@ -79,17 +58,6 @@ public function findOneByParentWithGreatestOrder($parentId, $siteId);
*/
public function findByIncludedPathAndSiteId($path, $siteId);

/**
* @param string $nodeId
* @param string $language
* @param string $siteId
*
* @deprecated will be removed in 1.2.0, use findInLastVersion instead
*
* @return mixed
*/
public function findOneByNodeIdAndLanguageAndSiteIdInLastVersion($nodeId, $language, $siteId);

/**
* @param string $nodeId
* @param string $language
Expand All @@ -99,19 +67,6 @@ public function findOneByNodeIdAndLanguageAndSiteIdInLastVersion($nodeId, $langu
*/
public function findInLastVersion($nodeId, $language, $siteId);

/**
* @param string $nodeId
* @param string $language
* @param string $siteId
*
* @throws \Exception
*
* @deprecated will be removed in 1.2.0, use findByNodeAndLanguageAndSite instead
*
* @return mixed
*/
public function findByNodeIdAndLanguageAndSiteId($nodeId, $language, $siteId);

/**
* @param string $nodeId
* @param string $language
Expand All @@ -123,19 +78,6 @@ public function findByNodeIdAndLanguageAndSiteId($nodeId, $language, $siteId);
*/
public function findByNodeAndLanguageAndSite($nodeId, $language, $siteId);

/**
* @param string $nodeId
* @param string $language
* @param string $siteId
*
* @throws \Exception
*
* @deprecated will be removed in 1.2.0, use findPublishedSortedByVersion instead
*
* @return mixed
*/
public function findByNodeIdAndLanguageAndSiteIdAndPublishedOrderedByVersion($nodeId, $language, $siteId);

/**
* @param string $nodeId
* @param string $language
Expand All @@ -147,16 +89,6 @@ public function findByNodeIdAndLanguageAndSiteIdAndPublishedOrderedByVersion($no
*/
public function findPublishedSortedByVersion($nodeId, $language, $siteId);

/**
* @param string $siteId
* @param string $type
*
* @deprecated will be removed in 1.2.0, use findLastVersionByType instead
*
* @return array
*/
public function findLastVersionBySiteId($siteId, $type = NodeInterface::TYPE_DEFAULT);

/**
* @param string $siteId
* @param string $type
Expand All @@ -165,17 +97,6 @@ public function findLastVersionBySiteId($siteId, $type = NodeInterface::TYPE_DEF
*/
public function findLastVersionByType($siteId, $type = NodeInterface::TYPE_DEFAULT);

/**
* @param string $path
* @param string $siteId
* @param string $language
*
* @deprecated will be removed in 1.2.0, use findSubTreeByPath instead
*
* @return mixed
*/
public function findChildrenByPathAndSiteIdAndLanguage($path, $siteId, $language);

/**
* @param string $path
* @param string $siteId
Expand All @@ -185,18 +106,6 @@ public function findChildrenByPathAndSiteIdAndLanguage($path, $siteId, $language
*/
public function findSubTreeByPath($path, $siteId, $language);

/**
* @param string $nodeId
* @param string $siteId
*
* @throws \Exception
*
* @deprecated will be removed in 1.2.0, use findByNodeAndSite instead
*
* @return mixed
*/
public function findByNodeIdAndSiteId($nodeId, $siteId);

/**
* @param string $nodeId
* @param string $siteId
Expand All @@ -217,17 +126,6 @@ public function findByNodeAndSite($nodeId, $siteId);
*/
public function findOneByNodeAndSite($nodeId, $siteId);

/**
* @param string $type
*
* @throws \Exception
*
* @deprecated used only in the fixtures, will be removed in 1.2.0
*
* @return array
*/
public function findByNodeType($type = NodeInterface::TYPE_DEFAULT);

/**
* @param string $type
* @param string $siteId
Expand All @@ -249,19 +147,6 @@ public function findByNodeTypeAndSite($type, $siteId);
*/
public function findByNodeIdAndNodeTypeAndSite($nodeId, $type, $siteId);

/**
*
* @param string $parentId
* @param string $routePattern
* @param string $nodeId
* @param string $siteId
*
* @deprecated will be removed in 1.2.0, use findByParentAndRoutePattern instead
*
* @return array
*/
public function findByParentIdAndRoutePatternAndNodeIdAndSiteId($parentId, $routePattern, $nodeId, $siteId);

/**
*
* @param string $parentId
Expand All @@ -283,18 +168,6 @@ public function findByParentAndRoutePattern($parentId, $routePattern, $nodeId, $
*/
public function hasOtherNodeWithSameParentAndOrder($parentId, $order, $nodeId, $siteId);

/**
* @param string $nodeId
* @param string $language
* @param string $siteId
* @param int|null $version
*
* @deprecated will be removed in 1.2.0, use findVersion instead
*
* @return mixed
*/
public function findOneByNodeIdAndLanguageAndSiteIdAndVersion($nodeId, $language, $siteId, $version = null);

/**
* @param string $nodeId
* @param string $language
Expand All @@ -305,17 +178,6 @@ public function findOneByNodeIdAndLanguageAndSiteIdAndVersion($nodeId, $language
*/
public function findVersion($nodeId, $language, $siteId, $version = null);

/**
* @param string $author
* @param boolean|null $published
* @param int|null $limit
*
* @return array
*
* @deprecated will be removed in 1.2.0
*/
public function findByAuthor($author, $published = null, $limit = null);

/**
* @param string $author
* @param string $siteId
Expand Down
34 changes: 0 additions & 34 deletions ModelInterface/Repository/PaginateRepositoryInterface.php

This file was deleted.

10 changes: 0 additions & 10 deletions ModelInterface/Repository/ReadContentRepositoryInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,6 @@ public function findByContentTypeAndKeywords($language, $contentType = '', $choi
*/
public function findByContentTypeAndCondition($language, $contentType = '', $choiceType = self::CHOICE_AND, $condition = null);

/**
* @param string $contentId
* @param string $language
*
* @deprecated will be removed in 1.2.0, use findLastPublishedVersion
*
* @return ContentInterface
*/
public function findLastPublishedVersionByContentIdAndLanguage($contentId, $language);

/**
* @param string $contentId
* @param string $language
Expand Down

0 comments on commit 9269d83

Please sign in to comment.