Merge pull request #764 from Joomla-Bible-Study/development

v9.1.0

.travis.yml

@@ -11,7 +11,7 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.3
+    - php: 5.4
 #    - php: 5.4
 #    - php: 5.5
 #    - php: 5.6

README.md

@@ -14,15 +14,15 @@ Status
     <tr>
         <td align="center"><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=development"/></a></td>
         <td align="center">Development</td>
-        <td align="center">9.0.18</td>
+        <td align="center">9.1.0</td>
         <td align="center">TBD</td>
         <td align="center">3.4+</td>
     </tr>
     <tr>
         <td align="center"><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=master"/></a></td>
         <td align="center">Master</td>
-        <td align="center">9.0.17</td>
-        <td align="center">May 11, 2017</td>
+        <td align="center">9.1.0</td>
+        <td align="center">Nov 3, 2017</td>
         <td align="center">3.4+</td>
     </tr>
 </table>

build.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="biblestudy" default="build" basedir=".">
+<project name="proclaim" default="build" basedir=".">
 	<php expression="include('vendor/autoload.php')"/>
 
 	<property name="basedir" value="${project.basedir}"/>
-	<property name="project.name" value="Joomla Bible Study"/>
+	<property name="project.name" value="Proclaim"/>
 
 	<!-- Joomla version to run the unit tests against -->
 	<property name="joomla.version" value="3.3.6"/>
@@ -116,45 +116,45 @@
 		</copy>
 		<copy todir="${basedir}/build/packages/_tmp">
 			<fileset dir="${basedir}/build">
-				<include name="pkg_biblestudy_package.xml"/>
+				<include name="pkg_proclaim_package.xml"/>
 				<include name="script.php"/>
 			</fileset>
 		</copy>
 
 		<!-- Create the archive -->
-		<delete file="${basedir}/build/packages/pkg_biblestudy.zip"/>
-		<zip destfile="${basedir}/build/packages/pkg_biblestudy.zip" basedir="${basedir}/build/packages/_tmp"/>
+		<delete file="${basedir}/build/packages/pkg_proclaim.zip"/>
+		<zip destfile="${basedir}/build/packages/pkg_proclaim.zip" basedir="${basedir}/build/packages/_tmp"/>
 
 		<!-- Remove the staged packages -->
 		<delete dir="${basedir}/build/packages/_tmp"/>
 	</target>
 
-	<!-- Create com_biblestudy.zip -->
+	<!-- Create com_proclaim.zip -->
 	<target name="package.component" depends="init,dev.clean" description="Builds the component">
-		<delete file="${basedir}/build/packages/component/com_biblestudy.zip"/>
-		<zip destfile="${basedir}/build/packages/component/com_biblestudy.zip" basedir="${basedir}/com_biblestudy"/>
+		<delete file="${basedir}/build/packages/component/com_proclaim.zip"/>
+		<zip destfile="${basedir}/build/packages/component/com_proclaim.zip" basedir="${basedir}/com_biblestudy"/>
 		<!--Reset back to a development state-->
 		<phingcall target="dev.init"/>
 	</target>
 
-	<!-- Create mod_biblestudy.zip and mod_biblestudy_podcast.zip -->
+	<!-- Create mod_proclaim.zip and mod_proclaim_podcast.zip -->
 	<target name="package.modules" depends="init" description="Builds the modules">
-		<delete file="${basedir}/build/packages/modules/mod_biblestudy.zip"/>
-		<delete file="${basedir}/build/packages/modules/mod_biblestudy_podcast.zip"/>
-		<zip destfile="${basedir}/build/packages/modules/mod_biblestudy.zip" basedir="${basedir}/mod_biblestudy"/>
-		<zip destfile="${basedir}/build/packages/modules/mod_biblestudy_podcast.zip" basedir="${basedir}/mod_biblestudy_podcast"/>
+		<delete file="${basedir}/build/packages/modules/mod_proclaim.zip"/>
+		<delete file="${basedir}/build/packages/modules/mod_proclaim_podcast.zip"/>
+		<zip destfile="${basedir}/build/packages/modules/mod_proclaim.zip" basedir="${basedir}/mod_biblestudy"/>
+		<zip destfile="${basedir}/build/packages/modules/mod_proclaim_podcast.zip" basedir="${basedir}/mod_biblestudy_podcast"/>
 	</target>
 
-	<!-- Create plg_biblestudy_finder.zip, plg_biblestudy_search.zip, plg_biblestudy_podcast.zip, and plg_biblestudy_backup.zip -->
+	<!-- Create plg_proclaim_finder.zip, plg_proclaim_search.zip, plg_proclaim_podcast.zip, and plg_proclaim_backup.zip -->
 	<target name="package.plugins" depends="init" description="Builds the plugins">
-		<delete file="${basedir}/build/packages/plugins/plg_biblestudy_finder.zip"/>
-		<delete file="${basedir}/build/packages/plugins/plg_biblestudy_search.zip"/>
-		<delete file="${basedir}/build/packages/plugins/plg_biblestudy_podcast.zip"/>
-		<delete file="${basedir}/build/packages/plugins/plg_biblestudy_backup.zip"/>
-		<zip destfile="${basedir}/build/packages/plugins/plg_biblestudy_finder.zip" basedir="${basedir}/plg_biblestudy_finder"/>
-		<zip destfile="${basedir}/build/packages/plugins/plg_biblestudy_search.zip" basedir="${basedir}/plg_biblestudy_search"/>
-		<zip destfile="${basedir}/build/packages/plugins/plg_biblestudy_podcast.zip" basedir="${basedir}/plg_biblestudy_podcast"/>
-		<zip destfile="${basedir}/build/packages/plugins/plg_biblestudy_backup.zip" basedir="${basedir}/plg_biblestudy_backup"/>
+		<delete file="${basedir}/build/packages/plugins/plg_proclaim_finder.zip"/>
+		<delete file="${basedir}/build/packages/plugins/plg_proclaim_search.zip"/>
+		<delete file="${basedir}/build/packages/plugins/plg_proclaim_podcast.zip"/>
+		<delete file="${basedir}/build/packages/plugins/plg_proclaim_backup.zip"/>
+		<zip destfile="${basedir}/build/packages/plugins/plg_proclaim_finder.zip" basedir="${basedir}/plg_biblestudy_finder"/>
+		<zip destfile="${basedir}/build/packages/plugins/plg_proclaim_search.zip" basedir="${basedir}/plg_biblestudy_search"/>
+		<zip destfile="${basedir}/build/packages/plugins/plg_proclaim_podcast.zip" basedir="${basedir}/plg_biblestudy_podcast"/>
+		<zip destfile="${basedir}/build/packages/plugins/plg_proclaim_backup.zip" basedir="${basedir}/plg_biblestudy_backup"/>
 	</target>
 
 	<!-- Setup config file for running the Selenium Webdriver tests -->

build/pkg_proclaim_package.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<extension type="package" version="3.4" method="upgrade">
+	<name>Package Proclaim</name>
+	<packagename>proclaim_package</packagename>
+	<description>
+		<![CDATA[Proclaim is one of the most popular Bible Study System available today. <a href='index.php?option=com_biblestudy&view=install&task=install.browse&scanstate=start'>Next to Finish install</a>]]></description>
+	<author>CWM Team</author>
+	<authorEmail>[email protected]</authorEmail>
+	<authorUrl>https://www.christianwebministries.org</authorUrl>
+	<copyright>(C) 2007 - 2017 Proclaim All rights reserved.</copyright>
+	<version>9.1.0</version>
+	<creationDate>Nov 3, 2017</creationDate>
+	<license>http://www.gnu.org/licenses/gpl.html</license>
+	<packager>CWM Team</packager>
+	<packagerurl>https://www.christianwebministries.org</packagerurl>
+
+	<!-- Runs on install/uninstall/update; New in 2.5 -->
+	<scriptfile>script.php</scriptfile>
+
+	<files folder="packages">
+		<file type="module" id="mod_biblestudy" client="site">mod_proclaim.zip</file>
+		<file type="module" id="mod_biblestudy_podcast" client="site">mod_proclaim_podcast.zip</file>
+		<file type="plugin" id="biblestudy" group="finder">plg_proclaim_finder.zip</file>
+		<file type="plugin" id="biblestudysearch" group="search">plg_proclaim_search.zip</file>
+		<file type="plugin" id="jbspodcast" group="system">plg_proclaim_podcast.zip</file>
+		<file type="plugin" id="jbsbackup" group="system">plg_proclaim_backup.zip</file>
+		<file type="component" id="com_biblestudy">com_proclaim.zip</file>
+	</files>
+</extension>

build/reports/cpd-code.xml

@@ -3201,7 +3201,7 @@ jimport('joomla.filesystem.file');
 /**
  * BibleStudy Install Script
  *
- * @package  BibleStudy.Admin
+ * @package  Proclaim.Admin
  * @since    7.0.0
  */
 class Com_BiblestudyInstallerScript
@@ -3306,7 +3306,7 @@ class Com_BiblestudyInstallerScript
         }
         else
         {
-            JFactory::$application->enqueueMessage('Your host needs to use PHP ' . $this->_minimum_php . ' or higher to run Joomla Bible Study');
+            JFactory::$application->enqueueMessage('Your host needs to use PHP ' . $this->_minimum_php . ' or higher to run Proclaim');
             $install_good = false;
         }
 
@@ -5035,7 +5035,7 @@ jimport('joomla.form.formfield');
 /**
  * Form Field class for the FileSize
  *
- * @package  BibleStudy.Admin
+ * @package  Proclaim.Admin
  * @since    7.0.0
  */
 class JFormFieldFilesize extends JFormField
@@ -5185,9 +5185,9 @@ jimport('joomla.form.helper');
 JFormHelper::loadFieldClass('list');
 
 /**
- * Virtuemart Category List Form Field class for the Joomla Bible Study component
+ * Virtuemart Category List Form Field class for the Proclaim component
  *
- * @package  BibleStudy.Admin
+ * @package  Proclaim.Admin
  * @since    7.0.4
  */
 class JFormFieldVirtuemart extends JFormFieldList