Commit 8cd78866 authored by Yassine Doghri's avatar Yassine Doghri
Browse files

fix(analytics): upgrade opawg's user-agents-php to user-agents-v2-php 

update php and js dependencies to latest
parent 9264a2d7

app/Controllers/FeedController.php

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ use CodeIgniter\HTTP\ResponseInterface; 
use Exception;

use Modules\PremiumPodcasts\Entities\Subscription;

use Modules\PremiumPodcasts\Models\SubscriptionModel;

use Opawg\UserAgentsPhp\UserAgentsRSS;

use Opawg\UserAgentsV2Php\UserAgentsRSS;



class FeedController extends Controller

{

composer.json

+14 −14
Original line number Diff line number Diff line
@@ -9,36 +9,36 @@ 
    "php": "^8.1",

    "adaures/ipcat-php": "^v1.0.0",

    "adaures/podcast-persons-taxonomy": "^v1.0.1",

    "aws/aws-sdk-php": "^3.291.0",

    "aws/aws-sdk-php": "^3.294.4",

    "chrisjean/php-ico": "^1.0.4",

    "cocur/slugify": "^v4.5.1",

    "codeigniter4/framework": "v4.4.3",

    "codeigniter4/settings": "v2.1.2",

    "codeigniter4/shield": "v1.0.0-beta.8",

    "codeigniter4/tasks": "dev-develop",

    "geoip2/geoip2": "v2.13.0",

    "geoip2/geoip2": "v3.0.0",

    "james-heinrich/getid3": "^2.0.0-beta5",

    "league/commonmark": "^2.4.1",

    "league/html-to-markdown": "5.1.1",

    "melbahja/seo": "^v2.1.1",

    "michalsn/codeigniter4-uuid": "v1.0.2",

    "mpratt/embera": "^2.0.36",

    "opawg/user-agents-php": "^v1.0",

    "opawg/user-agents-v2-php": "dev-main",

    "phpseclib/phpseclib": "~2.0.45",

    "vlucas/phpdotenv": "v5.6.0",

    "whichbrowser/parser": "^v2.1.7",

    "yassinedoghri/podcast-feed": "dev-main"

  },

  "require-dev": {

    "captainhook/captainhook": "^5.18.3",

    "codeigniter/phpstan-codeigniter": "^v1.4.2",

    "captainhook/captainhook": "^5.19.2",

    "codeigniter/phpstan-codeigniter": "v1.4.3",

    "mikey179/vfsstream": "^v1.6.11",

    "phpstan/extension-installer": "^1.3.1",

    "phpstan/phpstan": "^1.10.46",

    "phpunit/phpunit": "^10.4.2",

    "rector/rector": "^0.18.11",

    "symplify/coding-standard": "^12.0.4",

    "symplify/easy-coding-standard": "^12.0.8"

    "phpstan/phpstan": "^1.10.50",

    "phpunit/phpunit": "^10.5.3",

    "rector/rector": "^0.18.13",

    "symplify/coding-standard": "^12.0.7",

    "symplify/easy-coding-standard": "^12.0.13"

  },

  "autoload": {

    "exclude-from-classmap": [
@@ -60,8 +60,8 @@ 
    "style:fix": "vendor/bin/ecs check --fix --ansi",

    "generate:auth-docs": "php spark auth:generate-docs",

    "post-install-cmd": [

      "@php vendor/opawg/user-agents-php/src/UserAgentsGenerate.php > vendor/opawg/user-agents-php/src/UserAgents.php",

      "@php vendor/opawg/user-agents-php/src/UserAgentsRSSGenerate.php > vendor/opawg/user-agents-php/src/UserAgentsRSS.php",

      "@php vendor/opawg/user-agents-v2-php/src/UserAgentsGenerate.php > vendor/opawg/user-agents-v2-php/src/UserAgents.php",

      "@php vendor/opawg/user-agents-v2-php/src/UserAgentsRSSGenerate.php > vendor/opawg/user-agents-v2-php/src/UserAgentsRSS.php",

      "@php vendor/adaures/ipcat-php/src/IpDbGenerate.php > vendor/adaures/ipcat-php/src/IpDb.php",

      "@php vendor/adaures/podcast-persons-taxonomy/src/TaxonomyGenerate.php https://raw.githubusercontent.com/Podcastindex-org/podcast-namespace/main/taxonomy-en.json > modules/Admin/Language/en/PersonsTaxonomy.php",

      "@php vendor/adaures/podcast-persons-taxonomy/src/TaxonomyGenerate.php https://raw.githubusercontent.com/Podcastindex-org/podcast-namespace/main/taxonomy-fr.json > modules/Admin/Language/fr/PersonsTaxonomy.php",
@@ -69,8 +69,8 @@ 
    ],

    "post-update-cmd": [

      "@composer dump-autoload",

      "@php vendor/opawg/user-agents-php/src/UserAgentsGenerate.php > vendor/opawg/user-agents-php/src/UserAgents.php",

      "@php vendor/opawg/user-agents-php/src/UserAgentsRSSGenerate.php > vendor/opawg/user-agents-php/src/UserAgentsRSS.php",

      "@php vendor/opawg/user-agents-v2-php/src/UserAgentsGenerate.php > vendor/opawg/user-agents-v2-php/src/UserAgents.php",

      "@php vendor/opawg/user-agents-v2-php/src/UserAgentsRSSGenerate.php > vendor/opawg/user-agents-v2-php/src/UserAgentsRSS.php",

      "@php vendor/adaures/ipcat-php/src/IpDbGenerate.php > vendor/adaures/ipcat-php/src/IpDb.php",

      "@php vendor/adaures/podcast-persons-taxonomy/src/TaxonomyGenerate.php https://raw.githubusercontent.com/Podcastindex-org/podcast-namespace/main/taxonomy-en.json > modules/Admin/Language/en/PersonsTaxonomy.php",

      "@php vendor/adaures/podcast-persons-taxonomy/src/TaxonomyGenerate.php https://raw.githubusercontent.com/Podcastindex-org/podcast-namespace/main/taxonomy-fr.json > modules/Admin/Language/fr/PersonsTaxonomy.php",

composer.lock

+220 −167

File changed.

Preview size limit exceeded, changes collapsed.

docker/development/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ WORKDIR /castopod 
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer



# Install server requirements

RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \

RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \

    && apt-get update \

    && apt-get install --yes --no-install-recommends nodejs \

    # gnupg to sign commits with gpg

modules/Analytics/Entities/AnalyticsPodcastsByService.php

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ declare(strict_types=1); 
namespace Modules\Analytics\Entities;



use CodeIgniter\Entity\Entity;

use Opawg\UserAgentsPhp\UserAgentsRSS;

use Opawg\UserAgentsV2Php\UserAgentsRSS;



/**

 * @property int $podcast_id