Add adjustment to Diyanet and Refactor some code. Update Tests.

islamic-network · Sep 25, 2023 · 14d69be · 14d69be
1 parent 109e9dc
commit 14d69be
Show file tree

Hide file tree

Showing 12 changed files with 488 additions and 462 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-FROM ghcr.io/islamic-network/php:8.1-unit
+FROM ghcr.io/islamic-network/php:8.2-unit
 
 # Copy files
 COPY . /var/www/
 #COPY etc/apache2/mods-enabled/mpm_prefork.conf /etc/apache2/mods-enabled/mpm_prefork.conf
 COPY etc/unit/.unit.conf.json /docker-entrypoint.d/.unit.conf.json
 
 # Run Composer
-RUN cd /var/www && composer install --no-dev
+RUN export COMPOSER_ALLOW_SUPERUSER=1 && cd /var/www && composer install --no-dev
 
 # Delete stuff we do not need
 RUN rm -rf /var/www/.git
@@ -22,4 +22,4 @@ RUN rm -rf /var/www/.gitignore
 # COPY bin/doctrine/proxies.sh /usr/local/bin/doctrine-proxies.sh
 # RUN chmod -R 777 /tmp && chmod 755 /usr/local/bin/doctrine-proxies.sh
 # CMD ["/usr/local/bin/doctrine-proxies.sh"]
-###################################### Doctrine Proxies end ###################################################
+###################################### Doctrine Proxies end ###################################################
diff --git a/api/Controllers/v1/PrayerTimes.php b/api/Controllers/v1/PrayerTimes.php
@@ -19,6 +19,8 @@ class PrayerTimes extends Slim
 {
     public MemcachedAdapter $mc;
 
+    public HijriCalendar $hc;
+
 
     public function __construct(ContainerInterface $container)
     {

diff --git a/api/Utils/PrayerTimesHelper.php b/api/Utils/PrayerTimesHelper.php
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     "require": {
         "7x/sdk": "^1.4",
         "islamic-network/alqibla": "^1.2",
-        "islamic-network/prayer-times": "^1.0.23",
+        "islamic-network/prayer-times": "^1.0.24",
         "mamluk/kipchak": "^0.33",
         "rafaelfragoso/haversini-formula": "dev-master",
         "p3k/emoji-detector": "^0.2.1"