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

v9.2.1

.gitignore

@@ -1,131 +1,21 @@
 # Created by .ignore support plugin (hsz.mobi)
-
 # IntelliJ project files
 .idea
 out
 gen
 bin/
 build/reports/pmd.html
-com_biblestudy/admin/biblestudy.script.php
-com_biblestudy/admin/biblestudy.xml
 com_biblestudy/media/css/site/
-composer.lock
 composer.phar
-joomla/.gitignore
-joomla/.travis.yml
-joomla/CONTRIBUTING.md
-joomla/LICENSE.txt
-joomla/README.md
-joomla/README.txt
-joomla/administrator/components/
-joomla/administrator/help/
-joomla/administrator/includes/
-joomla/administrator/index.php
-joomla/administrator/language/
-joomla/administrator/manifests/
-joomla/administrator/modules/
-joomla/administrator/templates/
-joomla/bin/
-joomla/build.xml
-joomla/build/
-joomla/cli/
-joomla/components/
-joomla/htaccess.txt
-joomla/images/
-joomla/includes/
-joomla/index.php
-joomla/installation/
-joomla/language/
-joomla/layouts/
-joomla/libraries/
-joomla/media/
-joomla/modules/
-joomla/phpunit.xml.dist
-joomla/plugins/
-joomla/robots.txt.dist
-joomla/templates/
-joomla/tests/
-joomla/travisci-phpunit.xml
-joomla/web.config.txt
-vendor/autoload.php
-vendor/cilex/
-vendor/composer/
-vendor/container-interop/
-vendor/doctrine/
-vendor/erusev/
-vendor/friendsofphp/
-vendor/herrera-io/
-vendor/ircmaxell/
-vendor/jms/
-vendor/justinrainbow/
-vendor/kherge/
-vendor/leafo/
-vendor/monolog/
-vendor/nikic/
-vendor/paragonie/
-vendor/pdepend/
-Would skip repository vendor/pear/versioncontrol_git
-Would skip repository vendor/pear/pear_exception
-vendor/pear/cache_lite
-vendor/pear/console_getopt
-vendor/pear/pear-core-minimal
-vendor/phing/
-vendor/phpcollection/
-vendor/phpdocumentor/
-vendor/phpmailer/
-vendor/phpmd/
-vendor/phpoption/
-vendor/phpspec/
-vendor/phpunit/dbunit/.gitattributes
-vendor/phpunit/dbunit/.gitignore
-vendor/phpunit/dbunit/.travis.yml
-vendor/phpunit/dbunit/ChangeLog.markdown
-vendor/phpunit/dbunit/LICENSE
-vendor/phpunit/dbunit/PHPUnit/
-vendor/phpunit/dbunit/Samples/
-vendor/phpunit/dbunit/Tests/
-vendor/phpunit/dbunit/Vagrantfile
-vendor/phpunit/dbunit/build.xml
-vendor/phpunit/dbunit/build/
-vendor/phpunit/dbunit/composer.json
-vendor/phpunit/dbunit/dbunit.bat
-vendor/phpunit/dbunit/dbunit.php
-vendor/phpunit/dbunit/package.xml
-vendor/phpunit/dbunit/phpunit.xml.dist
-vendor/phpunit/php-code-coverage/
-vendor/phpunit/php-file-iterator/
-vendor/phpunit/php-text-template/
-vendor/phpunit/php-timer/
-vendor/phpunit/php-token-stream/
-vendor/phpunit/phpunit-mock-objects/
-vendor/phpunit/phpunit/
-vendor/pimple/
-vendor/psr/
-vendor/sebastian/
-vendor/seld/
-vendor/simplepie/simplepie/.gitignore
-vendor/simplepie/simplepie/.travis.yml
-vendor/simplepie/simplepie/LICENSE.txt
-vendor/simplepie/simplepie/README.markdown
-vendor/simplepie/simplepie/autoloader.php
-vendor/simplepie/simplepie/build/
-vendor/simplepie/simplepie/compatibility_test/
-vendor/simplepie/simplepie/composer.json
-vendor/simplepie/simplepie/db.sql
-vendor/simplepi
-e/simplepie/demo/cli_test.php
-vendor/simplepie/simplepie/demo/for_the_demo/
-vendor/simplepie/simplepie/demo/index.php
-vendor/simplepie/simplepie/demo/test.php
-vendor/simplepie/simplepie/idn/
-vendor/simplepie/simplepie/library/
-vendor/simplepie/simplepie/phpunit.xml.dist
-vendor/simplepie/simplepie/tests/
-vendor/squizlabs/
-vendor/symfony/
-vendor/twig/
-vendor/zendframework/
-vendor/zetacomponents/
-Would skip repository vendor/pear/pear_exception/
-Would skip repository vendor/pear/versioncontrol_git/
-vendor/simplepie/simplepie/demo/cli_test.php
+.DS_Store
+node_modules/
+/admin/biblestudy.script.php
+/admin/biblestudy.xml
+build/reports/cpd-code.xml
+build/reports/jdepend-dependencies.svg
+build/reports/jdepend-pyramid.svg
+build/reports/jdepend.xml
+build/reports/phpcs-checkstyle.xml
+build/reports/project-size.txt
+/libraries/vendor/
+composer.lock

.travis.yml

@@ -19,11 +19,6 @@ matrix:
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
     - php: 7.3
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no"
-    - php: nightly
-      env: INSTALL_APCU="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no"
-  allow_failures:
-    - php: 7.3
-    - php: nightly
 
 services:
 
@@ -33,8 +28,7 @@ before_script:
   - composer install
 
 script:
-  #- libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml
-  - if [[ $RUN_PHPCS == "yes" ]]; then bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
+  - if [[ $RUN_PHPCS == "yes" ]]; then libraries/vendor/bin/phpcs --report=full --ignore=*/tests/*,*/data/*,*/vendor/*,*/tmpl/* --extensions=php -p --standard=libraries/vendor/joomla/coding-standards/Joomla .; fi
   - if [[ $RUN_UNIT_TESTS == "yes" ]]; then libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml; fi
 
 branches:

README.md

@@ -21,8 +21,8 @@ Status
     <tr>
         <td align="center"><a href="https://travis-ci.com/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.com/Joomla-Bible-Study/Joomla-Bible-Study.svg?branch=master"/></a></td>
         <td align="center">Master</td>
-        <td align="center">9.2.0</td>
-        <td align="center">Feb 27, 2019</td>
+        <td align="center">9.2.1</td>
+        <td align="center">Oct 31, 2019</td>
         <td align="center">3.8+</td>
     </tr>
 </table>

admin/access.xml

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_biblestudy">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC"/>
+		<action name="core.manage" title="JACTION_MANAGE"
+		        description="JACTION_MANAGE_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="message">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="teacher">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="location">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="serie">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="topic">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="podcast">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="share">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="comment">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+
+	<section name="mediafile">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="messagetype">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="server">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="template">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+
+	<section name="cssedit">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="style">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="templatecode">
+		<action name="core.delete" title="JACTION_DELETE"
+		        description="JACTION_DELETE_COMPONENT_DESC"/>
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+		<action name="core.create" title="JACTION_CREATE"
+		        description="JACTION_CREATE_COMPONENT_DESC"/>
+		<action name="core.edit.state" title="JACTION_EDITSTATE"
+		        description="JACTION_EDITSTATE_COMPONENT_DESC"/>
+		<action name="core.edit.own" title="JACTION_EDITOWN"
+		        description="JACTION_EDITOWN_COMPONENT_DESC"/>
+	</section>
+	<section name="admin">
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC"/>
+	</section>
+</access>

com_biblestudy/admin/addons/addon.php → admin/addons/addon.php

@@ -131,7 +131,7 @@ public function getXml()
 	 * @param   string  $type    ?
 	 * @param   array   $config  ?
 	 *
-	 * @return bool
+	 * @return boolean
 	 *
 	 * @since   9.0.0
 	 */