Merge pull request #210 from xini/patch-1

update gridfieldextensions vendor and version

.travis.yml

@@ -5,7 +5,6 @@ sudo: false
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
@@ -18,7 +17,7 @@ matrix:
     - php: 5.6
       env: DB=MYSQL CORE_RELEASE=3
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.1
+      env: DB=MYSQL CORE_RELEASE=3.6
     - php: 5.6
       env: DB=MYSQL CORE_RELEASE=3.3
     - php: 5.6

code/cms/DMSDocumentAddController.php

@@ -27,6 +27,8 @@ class DMSDocumentAddController extends LeftAndMain
      * Add an array of additional allowed extensions
      * @static
      * @param $array
+     *
+     * @deprecated 2.0 Will be removed in future in favour of YAML configuration
      */
     public static function add_allowed_extensions($array = null)
     {

code/extensions/DMSSiteTreeExtension.php

@@ -18,6 +18,8 @@ class DMSSiteTreeExtension extends DataExtension
      * Do not show the documents tab on the array of pages set here
      * @static
      * @param $mixed Array of page types to not show the Documents tab on
+     *
+     * @deprecated 2.0 Will be removed in favour of YAML configuration
      */
     public static function no_documents_tab($array = array())
     {
@@ -36,6 +38,8 @@ class DMSSiteTreeExtension extends DataExtension
      * still not be shown. If this isn't called, or if it is called with an empty array, all pages will get Document tabs.
      * @static
      * @param $array Array of page types to show the Documents tab on
+     *
+     * @deprecated 2.0 Will be removed in favour of YAML configuration
      */
     public static function show_documents_tab($array = array())
     {
@@ -132,6 +136,8 @@ class DMSSiteTreeExtension extends DataExtension
 
     /**
      * Enforce sorting for frontend
+     *
+     * @deprecated 2.0 Will be removed in future
      */
     public function PageDocuments()
     {

code/interface/DMSDocumentInterface.php

@@ -11,7 +11,7 @@ interface DMSDocumentInterface
      * Deletes the DMSDocument, its underlying file, as well as any tags related to this DMSDocument.
      *
      * @todo Can't be applied to classes which already implement the DataObjectInterface (naming conflict)
-     * 
+     *
      * @abstract
      * @return null
      */
@@ -23,15 +23,19 @@ interface DMSDocumentInterface
      * @abstract
      * @param $pageObject Page object to associate this DMSDocument with
      * @return null
+     *
+     * @deprecated 2.0 Will be removed in future in favour of document sets
      */
     public function addPage($pageObject);
-    
+
     /**
      * Associates this DMSDocument with a set of Pages. This method loops through a set of page ids, and then associates this
      * DMSDocument with the individual Page with the each page id in the set
      * @abstract
      * @param $pageIDs array of page ids used for the page objects associate this DMSDocument with
      * @return null
+     *
+     * @deprecated 2.0 Will be removed in future in favour of document sets
      */
     public function addPages($pageIDs);
 
@@ -47,6 +51,8 @@ interface DMSDocumentInterface
      * Returns a list of the Page objects associated with this DMSDocument
      * @abstract
      * @return DataList
+     *
+     * @deprecated 2.0 Will be removed in future in favour of document sets
      */
     public function getPages();
 
@@ -54,6 +60,8 @@ interface DMSDocumentInterface
      * Removes all associated Pages from the DMSDocument
      * @abstract
      * @return null
+     *
+     * @deprecated 2.0 Will be removed in future in favour of document sets
      */
     public function removeAllPages();
 
@@ -69,6 +77,8 @@ interface DMSDocumentInterface
      * @param $value String of a metadata value to add (required)
      * @param bool $multiValue Boolean that determines if the category is multi-value or single-value (optional)
      * @return null
+     *
+     * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
      */
     public function addTag($category, $value, $multiValue = true);
 
@@ -79,6 +89,8 @@ interface DMSDocumentInterface
      * @param $category String of the metadata category to get
      * @param null $value String of the value of the tag to get
      * @return array of Strings of all the tags or null if there is no match found
+     *
+     * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
      */
     public function getTagsList($category, $value = null);
 
@@ -90,6 +102,8 @@ interface DMSDocumentInterface
      * @param $category Category to remove (required)
      * @param null $value Value to remove (optional)
      * @return null
+     *
+     * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
      */
     public function removeTag($category, $value = null);
 
@@ -97,6 +111,8 @@ interface DMSDocumentInterface
      * Deletes all tags associated with this DMSDocument.
      * @abstract
      * @return null
+     *
+     * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
      */
     public function removeAllTags();
 
@@ -106,12 +122,12 @@ interface DMSDocumentInterface
      * @return String
      */
     public function getLink();
-    
+
     /**
      * Return the extension of the file associated with the document
      */
     public function getExtension();
-    
+
     /**
      * Returns the size of the file type in an appropriate format.
      *

code/interface/DMSInterface.php

@@ -32,6 +32,8 @@ interface DMSInterface
      *
      * Returns a number of Document objects based on the a search by tags. You can search by category alone,
      * by tag value alone, or by both. I.e: getByTag("fruits",null); getByTag(null,"banana"); getByTag("fruits","banana")
+     *
+     * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
      * @abstract
      * @param null $category The metadata category to search for
      * @param null $value The metadata value to search for

code/model/DMSDocument.php

@@ -164,6 +164,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * @param SiteTree $pageObject Page object to associate this Document with
      *
      * @return DMSDocument
+     *
+     * @deprecated 2.0 Will be removed in future in favour of document sets
      */
     public function addPage($pageObject)
     {
@@ -182,6 +184,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * @param array $pageIDs
      *
      * @return DMSDocument
+     *
+     * @deprecated 2.0 Will be removed in future in favour of document sets
      */
     public function addPages($pageIDs)
     {
@@ -203,6 +207,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * @param SiteTree $pageObject Page object to remove the association to
      *
      * @return DMSDocument
+     *
+     * @deprecated 2.0 Will be removed in future in favour of document sets
      */
     public function removePage($pageObject)
     {
@@ -215,6 +221,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * @see getPages()
      *
      * @return DataList
+     *
+     * @deprecated 2.0 Will be removed in future in favour of document sets
      */
     public function Pages()
     {
@@ -228,6 +236,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * Returns a list of the Page objects associated with this Document.
      *
      * @return DataList
+     *
+     * @deprecated 2.0 Will be removed in future in favour of document sets
      */
     public function getPages()
     {
@@ -238,6 +248,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * Removes all associated Pages from the DMSDocument
      *
      * @return DMSDocument
+     *
+     * @deprecated 2.0 Will be removed in future in favour of document sets
      */
     public function removeAllPages()
     {
@@ -286,6 +298,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * 					multi-value or single-value (optional)
      *
      * @return DMSDocument
+     *
+     * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
      */
     public function addTag($category, $value, $multiValue = true)
     {
@@ -338,6 +352,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * @param string $value
      *
      * @return DataList
+     *
+     * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
      */
     protected function getTagsObjects($category, $value = null)
     {
@@ -359,6 +375,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * @param string $value value of the tag to get
      *
      * @return array Strings of all the tags or null if there is no match found
+     *
+     * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
      */
     public function getTagsList($category, $value = null)
     {
@@ -390,6 +408,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * @param string $value Value to remove
      *
      * @return DMSDocument
+     *
+     * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
      */
     public function removeTag($category, $value = null)
     {
@@ -416,6 +436,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface
      * Deletes all tags associated with this Document.
      *
      * @return DMSDocument
+     *
+     * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
      */
     public function removeAllTags()
     {

code/model/DMSTag.php

@@ -4,6 +4,7 @@
  * Hold a set of metadata category/value tags associated with a DMSDocument
  *
  * @package dms
+ * @deprecated 2.0 Will be removed in future in favour of using silverstripe/taxonomy
  */
 class DMSTag extends DataObject
 {

composer.json

@@ -11,7 +11,7 @@
     "require": {
         "silverstripe/framework": "~3.1",
         "silverstripe/cms": "~3.1",
-        "silverstripe-australia/gridfieldextensions": "^1.1.0"
+        "symbiote/silverstripe-gridfieldextensions": "^2.0"
     },
     "extra": {
         "branch-alias": {