Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Makefile

@@ -67,4 +67,31 @@ doc:
 apidoc:
 	tools/apigen/bin/apigen SeedDMS_Core/Core --exclude "tests/*" --output html
 
-.PHONY: doc webdav webapp repository
+# Turn the package.xml file into CHANGELOG.md
+#
+# The idea is to form blocks of lines separated by an empty line.
+# Echo block consists of the version number, release date und notes.
+# This blocks are turned into single lines which are than sorted.
+# Afterwards the single lines are turned back into blocks.
+#
+# It first uses sgrep to extract the version, date und notes. This is
+# feed to sed to isolated the date and version and put them on separate
+# lines. Each version
+# forms a block of n lines with the first two being the version and date.
+# All remaining lines are notes. Blocks are separated by an empty line.
+# It's important to form blocks without ane empty lines because the following
+# awk will create a single line from each block which can then be sorted
+# (or simply reversed in order).
+# Because the blocks are listed in the wrong order (last version first and
+# previous version last, e.g. 5.1.29, 3.3.0, 3.3.1, ...., 5.1.27, 5.1.28) they
+# need to be reversed in order. This is done by turning each block into line
+# with the former new lines replaced by a '|'. So it's basically a '|' separated
+# csv file which is then reversed in order by 'sort -r'. In order to separate
+# blocks by a newline, each line of that output is appended by another
+# line break. Result is put back
+# into the original format by replacing all '|' by newline.
+#
+changelog:
+	@sgrep 'stag("DATE") .. etag("DATE") or ((stag("RELEASE") .. etag("RELEASE")) in (stag("VERSION") .. etag("VERSION"))) or inner(stag("NOTES") __ etag("NOTES"))' SeedDMS_Core/package.xml | sed -e 's#^ *<date>\([-0-9]*\)</date><release>\([0-9.]*\)</release>#\n\n\2 (\1)\n---------------------#' | awk -F'\n' -vRS='' -vOFS='|' '{$$1=$$1}1' | sort -V -r | sed 's/$$/\n/' | tr '|' '\n'
+
+.PHONY: doc webdav webapp repository changelog

SeedDMS_Core/package.xml

@@ -115,6 +115,7 @@
  <phprelease />
  <changelog>
   <release>
+   <date>2010-04-27</date>
    <version>
     <release>3.0.0</release>
     <api>3.0.0</api>
@@ -123,13 +124,14 @@
     <release>stable</release>
     <api>stable</api>
    </stability>
-   <date>2010-04-27</date>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 Initial release
    </notes>
   </release>
   <release>
+   <date>2011-07-23</date>
+   <time>08:05:38</time>
    <version>
     <release>3.2.0</release>
     <api>3.2.0</api>
@@ -138,8 +140,6 @@ Initial release
     <release>stable</release>
     <api>stable</api>
    </stability>
-   <date>2011-07-23</date>
-   <time>08:05:38</time>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 New release
@@ -1501,13 +1501,13 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
-if the owner tries to access them
-Check return value of onPreRemove[Document|Folder], return from calling method if bool
-Add SeedDMS_Core_DMS::getDocumentList()
-Limit number of duplicate files to 1000
-Add hook on(Pre|Post)RemoveContent
-Add hook onAttributeValidate
+- SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
+  if the owner tries to access them
+- Check return value of onPreRemove[Document|Folder], return from calling method if bool
+- Add SeedDMS_Core_DMS::getDocumentList()
+- Limit number of duplicate files to 1000
+- Add hook on(Pre|Post)RemoveContent
+- Add hook onAttributeValidate
    </notes>
   </release>
   <release>
@@ -1590,9 +1590,9 @@ returns just users which are not disabled
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add SeedDMS_Core_Folder::getDocumentsMinMax()
-add lots of DocBlocks from merge request #8
-add SeedDMS_Core_AttributeDefinition::removeValue()
+- add SeedDMS_Core_Folder::getDocumentsMinMax()
+- add lots of DocBlocks from merge request #8
+- add SeedDMS_Core_AttributeDefinition::removeValue()
    </notes>
   </release>
   <release>
@@ -1608,7 +1608,7 @@ add SeedDMS_Core_AttributeDefinition::removeValue()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-just bump version
+- just bump version
    </notes>
   </release>
   <release>
@@ -1624,10 +1624,10 @@ just bump version
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-SeedDMS_Core_DMS::search() returns false in case of an error
-do not use views in DBAccessPDO by default anymore, use temp. tables
-SeedDMS_Core_Document::getNotifyList() has new parameter to include disabled user in list
-fix possible sql injection in SeedDMS_Core_User
+- SeedDMS_Core_DMS::search() returns false in case of an error
+- do not use views in DBAccessPDO by default anymore, use temp. tables
+- SeedDMS_Core_Document::getNotifyList() has new parameter to include disabled user in list
+- fix possible sql injection in SeedDMS_Core_User
    </notes>
   </release>
   <release>
@@ -1643,10 +1643,10 @@ fix possible sql injection in SeedDMS_Core_User
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-context can be passed to getAccessMode()
-call hook in SeedDMS_Core_Folder::getAccessMode()
-new optional parameter $listguest for SeedDMS_Core_Document::getReadAccessList()
-remove deprecated methods SeedDMS_Core_Document::convert(), SeedDMS_Core_Document::wasConverted(), SeedDMS_Core_Document::viewOnline(), SeedDMS_Core_Document::getUrl()
+- context can be passed to getAccessMode()
+- call hook in SeedDMS_Core_Folder::getAccessMode()
+- new optional parameter $listguest for SeedDMS_Core_Document::getReadAccessList()
+- remove deprecated methods SeedDMS_Core_Document::convert(), SeedDMS_Core_Document::wasConverted(), SeedDMS_Core_Document::viewOnline(), SeedDMS_Core_Document::getUrl()
    </notes>
   </release>
   <release>
@@ -1662,8 +1662,8 @@ remove deprecated methods SeedDMS_Core_Document::convert(), SeedDMS_Core_Documen
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-fix php warning if workflow state doesn' have next transition
-add method SeedDMS_Core_DatabaseAccess::setLogFp()
+- fix php warning if workflow state doesn' have next transition
+- add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </notes>
   </release>
   <release>
@@ -1679,7 +1679,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-???
+- ???
    </notes>
   </release>
   <release>

build.xml

@@ -63,7 +63,7 @@
 
 	<!-- PHPUnit -->
 	<target name="phpunitfast" description="Run tests">
-		<exec dir="${srcdir}/SeedDMS_Core" command="XDEBUG_MODE=coverage ${srcdir}/vendor/bin/phpunit --bootstrap ${srcdir}/SeedDMS_Core/bootstrap-${majorversion}.php --coverage-html ${srcdir}/coverage/" passthru="true" checkreturn="true" />
+		<exec dir="${srcdir}/SeedDMS_Core" command="XDEBUG_MODE=coverage SEEDDMS_CORE_SQL=../install/create_tables-sqlite3.sql ${srcdir}/vendor/bin/phpunit --bootstrap ${srcdir}/SeedDMS_Core/bootstrap-${majorversion}.php --coverage-html ${srcdir}/coverage/" passthru="true" checkreturn="true" />
 		<!-- exec dir="${srcdir}/tests" command="SEEDDMS_URL=${seeddmsurl} SEEDDMS_MINK_DRIVER=${mink_driver} SEEDDMS_SNOOZE_MULTIPLIER=${snooze_multiplier} ${srcdir}/vendor/bin/phpunit" passthru="true" checkreturn="true" / -->
 	</target>