getBible/joomla-component
6
3
Fork 0
Code Issues Pull Requests Wiki Activity

Release of v5.0.15-alpha1

Browse Source 
Fix install issue with missing method removeFolder.
This commit is contained in:
Robot 2024-07-15 17:13:51 +02:00
parent 831530ff6b
commit 26f893f4ff
Signed by: Robot
GPG Key ID: 14DECD44E7E1BB95
9 changed files with 120 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CHANGELOG.md
View File

@ -1,4 +1,8 @@
# v5.0.14
# v5.0.15-alpha1
- Fix install issue with missing method removeFolder
# v5.0.15-alpha
- Refactored the API classes
- Add table schema checker
@ -63,12 +67,10 @@
- Moved to Joomla 4 and 5
# v4.0.14
# v4.0.13
- Refactored the API classes
- Add table schema checker
- Add back to Bible button to Open AI page.
# v3.1.2
# v3.1.1
- Refactored the API classes
- Add table schema checker
- Add back to Bible button to Open AI page.

90
GetbibleInstallerScript.php
View File

@ -314,6 +314,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla.GetBible';
$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla.Gitea';
$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla.Openai';
$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianBible.Joomla/src/GetBible';
foreach ($removeFolders as $folder)
{
@ -325,19 +326,6 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
if ($type === 'install')
{
// all things to clear out
$removeFolders = [];
$removeFolders[] = JPATH_LIBRARIES . '/jcb_powers/VDM.Joomla.GetBible';
$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla';
$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla.GetBible';
$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla.Gitea';
$removeFolders[] = JPATH_LIBRARIES . '/vendor_getbible/TrueChristianChurch.Joomla.Openai';
foreach ($removeFolders as $folder)
{
$this->removeFolder($folder);
}
// Check that the required configuration are set for PHP
$this->phpConfigurationCheck($this->app);
}
@ -802,7 +790,7 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://getbible.net" title="Get Bible">
<img src="components/com_getbible/assets/images/vdm-component.jpg"/>
</a>
<h3>Upgrade to Version 5.0.14 Was Successful! Let us know if anything is not working as expected.</h3></div>';
<h3>Upgrade to Version 5.0.15-alpha1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
// Add/Update component in the action logs extensions table.
$this->setActionLogsExtensions();
@ -1009,6 +997,80 @@ class Com_GetbibleInstallerScript implements InstallerScriptInterface
return true;
}
/**
* Remove folders with files (with ignore options)
*
* @param string $dir The path to the folder to remove.
* @param array|null $ignore The folders and files to ignore and not remove.
*
* @return bool True if all specified files/folders are removed, false otherwise.
* @since 3.2.2
*/
protected function removeFolder(string $dir, ?array $ignore = null): bool
{
if (!Folder::exists($dir))
{
return false;
}
$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
$it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
// Remove trailing slash
$dir = rtrim($dir, '/');
foreach ($it as $file)
{
$filePath = $file->getPathname();
$relativePath = str_replace($dir . '/', '', $filePath);
if ($ignore !== null && in_array($relativePath, $ignore, true))
{
continue;
}
if ($file->isDir())
{
Folder::delete($filePath);
}
else
{
File::delete($filePath);
}
}
// Delete the root folder if there are no ignored files/folders left
if ($ignore === null || $this->isDirEmpty($dir, $ignore))
{
return Folder::delete($dir);
}
return true;
}
/**
* Check if a directory is empty considering ignored files/folders.
*
* @param string $dir The path to the folder to check.
* @param array $ignore The folders and files to ignore.
*
* @return bool True if the directory is empty or contains only ignored items, false otherwise.
* @since 3.2.1
*/
protected function isDirEmpty(string $dir, array $ignore): bool
{
$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
foreach ($it as $file)
{
$relativePath = str_replace($dir . '/', '', $file->getPathname());
if (!in_array($relativePath, $ignore, true))
{
return false;
}
}
return true;
}
/**
* Remove the files and folders in the given array from
*

8
README.md
View File

@ -1,4 +1,4 @@
# Get Bible (5.0.14)
# Get Bible (5.0.15-alpha1)
![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/admin/assets/images/vdm-component.jpg "GetBible")
@ -19,7 +19,7 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
+ *Name*: [Get Bible](https://getbible.net)
+ *First Build*: 3rd December, 2015
+ *Last Build*: 15th July, 2024
+ *Version*: 5.0.14
+ *Version*: 5.0.15-alpha1
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@ -31,8 +31,8 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.)
+ *Line count*: **230106**
+ *File count*: **1904**
+ *Line count*: **230189**
+ *File count*: **1905**
+ *Folder count*: **193**
**424 Hours** or **53 Eight Hour Days** (the actual time the author spent)

8
admin/README.txt
View File

@ -1,4 +1,4 @@
# Get Bible (5.0.14)
# Get Bible (5.0.15-alpha1)
![Get Bible image](https://git.vdm.dev/getBible/joomla-component/raw/branch/5.0/admin/assets/images/vdm-component.jpg "GetBible")
@ -19,7 +19,7 @@ In essence, The Bible for Joomla is designed to transform how the Word of God is
+ *Name*: [Get Bible](https://getbible.net)
+ *First Build*: 3rd December, 2015
+ *Last Build*: 15th July, 2024
+ *Version*: 5.0.14
+ *Version*: 5.0.15-alpha1
+ *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@ -31,8 +31,8 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
> never making one mistake or taking any coffee break.)
+ *Line count*: **230106**
+ *File count*: **1904**
+ *Line count*: **230189**
+ *File count*: **1905**
+ *Folder count*: **193**
**424 Hours** or **53 Eight Hour Days** (the actual time the author spent)

0
admin/sql/updates/mysql/3.1.2.sql → admin/sql/updates/mysql/3.1.1.sql
View File

0
admin/sql/updates/mysql/4.0.14.sql → admin/sql/updates/mysql/4.0.13.sql
View File

1
admin/sql/updates/mysql/5.0.15-alpha.sql Normal file
View File

@ -0,0 +1 @@

4
getbible.xml
View File

@ -7,9 +7,9 @@
<authorUrl>https://getbible.net</authorUrl>
<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
<version>5.0.14</version>
<version>5.0.15-alpha1</version>
<description><![CDATA[
<h1>Get Bible (v.5.0.14)</h1>
<h1>Get Bible (v.5.0.15-alpha1)</h1>
<div style="clear: both;"></div>
<p>Welcome to the next level of scripture engagement - The Bible for Joomla! Our purpose is to bring the Word of God to every person, in their native language, entirely free. This isn't just a typical extension; it's a groundbreaking tool developed to span language divides and deliver a rich, customizable Bible study experience to users worldwide.

30
update_server.xml
View File

@ -5,10 +5,10 @@
<element>pkg_getbible</element>
<type>package</type>
<client>site</client>
<version>3.1.2</version>
<version>3.1.1</version>
<infourl title="Get Bible!">https://getbible.net</infourl>
<downloads>
<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.1.2.zip</downloadurl>
<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v3.1.1.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
@ -23,10 +23,10 @@
<element>pkg_getbible</element>
<type>package</type>
<client>site</client>
<version>4.0.14</version>
<version>4.0.13</version>
<infourl title="Get Bible!">https://getbible.net</infourl>
<downloads>
<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v4.0.14.zip</downloadurl>
<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v4.0.13.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
@ -293,10 +293,10 @@
<element>pkg_getbible</element>
<type>package</type>
<client>site</client>
<version>5.0.14</version>
<version>5.0.15-alpha</version>
<infourl title="Get Bible!">https://getbible.net</infourl>
<downloads>
<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v5.0.14.zip</downloadurl>
<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v5.0.15-alpha1.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
@ -305,4 +305,22 @@
<maintainerurl>https://getbible.net</maintainerurl>
<targetplatform name="joomla" version="5\.[01]"/>
</update>
<update>
<name>Get Bible</name>
<description>The Bible for Joomla</description>
<element>pkg_getbible</element>
<type>package</type>
<client>site</client>
<version>5.0.15-alpha1</version>
<infourl title="Get Bible!">https://getbible.net</infourl>
<downloads>
<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/getBible/joomla-pkg/archive/v5.0.15-alpha1.zip</downloadurl>
</downloads>
<tags>
<tag>alpha</tag>
</tags>
<maintainer>Llewellyn van der Merwe</maintainer>
<maintainerurl>https://getbible.net</maintainerurl>
<targetplatform name="joomla" version="5\.[01]"/>
</update>
</updates>