mirror of
https://github.com/NNTmux/newznab-tmux.git
synced 2026-09-02 11:18:56 +00:00
Merge branch 'master' into fix-groups-query
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
DB_CONNECTION=mysql
|
||||
DB_HOST = 127.0.0.1
|
||||
DB_PORT = 3306
|
||||
DB_SOCKET =
|
||||
DB_USERNAME = TEST
|
||||
DB_PASSWORD = TEST
|
||||
DB_DATABASE = TEST
|
||||
|
||||
NNTP_USERNAME =
|
||||
NNTP_PASSWORD =
|
||||
NNTP_SERVER =
|
||||
NNTP_PORT =
|
||||
NNTP_SSLENABLED = false
|
||||
NNTP_SOCKET_TIMEOUT =120
|
||||
|
||||
NNTP_USERNAME_A =
|
||||
NNTP_PASSWORD_A =
|
||||
NNTP_SERVER_A =
|
||||
NNTP_PORT_A =
|
||||
NNTP_SSLENABLED_A = false
|
||||
NNTP_SOCKET_TIMEOUT_A = 120
|
||||
|
||||
|
||||
NN_SSL_CAFILE =
|
||||
NN_SSL_CAPATH =
|
||||
NN_SSL_VERIFY_PEER =
|
||||
NN_SSL_VERIFY_HOST =
|
||||
NN_SSL_ALLOW_SELF_SIGNED = 1
|
||||
|
||||
ADMIN_USER = TEST
|
||||
ADMIN_PASS = TEST
|
||||
ADMIN_EMAIL = test@example.com
|
||||
|
||||
APP_NAME=NNTmux
|
||||
APP_ENV=local
|
||||
APP_DEBUG=true
|
||||
APP_URL=
|
||||
APP_KEY=
|
||||
|
||||
TELESCOPE_ENABLED=false
|
||||
+3
-1
@@ -1,5 +1,5 @@
|
||||
DB_CONNECTION=mysql
|
||||
DB_HOST = localhost
|
||||
DB_HOST = 127.0.0.1
|
||||
DB_PORT = 3306
|
||||
DB_SOCKET =
|
||||
DB_USERNAME = TEST
|
||||
@@ -36,3 +36,5 @@ APP_ENV=local
|
||||
APP_DEBUG=true
|
||||
APP_URL=
|
||||
APP_KEY=
|
||||
|
||||
TELESCOPE_ENABLED=false
|
||||
|
||||
@@ -2,44 +2,52 @@ name: Laravel
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ master, dev ]
|
||||
branches: [master, dev]
|
||||
pull_request:
|
||||
branches: [ master, dev ]
|
||||
branches: [master, dev]
|
||||
|
||||
jobs:
|
||||
laravel-tests:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
services:
|
||||
mysql:
|
||||
image: mariadb:10.4
|
||||
env:
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD: yes
|
||||
MYSQL_DATABASE: TEST
|
||||
ports:
|
||||
- 3306
|
||||
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
|
||||
|
||||
mysql:
|
||||
image: mariadb:10
|
||||
env:
|
||||
MYSQL_ALLOW_EMPTY_PASSWORD: yes
|
||||
MYSQL_DATABASE: TEST
|
||||
MYSQL_USER: TEST
|
||||
MYSQL_PASSWORD: TEST
|
||||
ports:
|
||||
- 3306:3306
|
||||
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
|
||||
|
||||
steps:
|
||||
- name: Setup PHP
|
||||
uses: shivammathur/setup-php@v2
|
||||
with:
|
||||
php-version: '7.4'
|
||||
extensions: gd, intl, memcached, sodium
|
||||
composer: v2
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Copy .env
|
||||
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
|
||||
run: cp .env.test .env
|
||||
|
||||
- name: Install Dependencies
|
||||
run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
|
||||
run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
|
||||
|
||||
- name: Generate key
|
||||
run: php artisan key:generate
|
||||
|
||||
- name: Directory Permissions
|
||||
run: chmod -R 777 storage bootstrap/cache
|
||||
- name: Create Database
|
||||
run: |
|
||||
mysql -u root -e "SET GLOBAL innodb_file_per_table = 1;"
|
||||
mysql -u root -e "SET GLOBAL innodb_file_format = BARRACUDA;"
|
||||
mysql -u root -e "SET GLOBAL innodb_large_prefix = 1;"
|
||||
mysql -u root -e "CREATE DATABASE TEST;"
|
||||
mysql -u root -e "GRANT ALL ON TEST.* TO 'TEST'@'localhost' IDENTIFIED BY 'TEST';"
|
||||
if [[ -f /etc/mysql/my.cnf ]]; then sudo sed -i "s/\[mysqld\]/\[mysqld\]\ngroup_concat_max_len = 8192/" /etc/mysql/my.cnf; fi
|
||||
|
||||
- name: Execute tests (Unit and Feature tests) via PHPUnit
|
||||
env:
|
||||
DB_CONNECTION: mysql
|
||||
DB_DATABASE: TEST
|
||||
run: vendor/bin/phpunit
|
||||
run: |
|
||||
mkdir -p /home/runner/work/newznab-tmux/newznab-tmux/tests/Unit
|
||||
mkdir -p /home/runner/work/newznab-tmux/newznab-tmux/tests/build/logs
|
||||
vendor/bin/phpunit
|
||||
|
||||
+2
-11
@@ -1,7 +1,6 @@
|
||||
language: php
|
||||
sudo: required
|
||||
dist: xenial
|
||||
group: edge
|
||||
dist: bionic
|
||||
|
||||
branches:
|
||||
only:
|
||||
@@ -20,11 +19,10 @@ notifications:
|
||||
- "\x030[\x0310Travis-ci\x030]\x03 Commit \x0314{%{commit}}\x03 by \x0315(%{author})\x03@\x0313%{repository_name}/%{branch}\x03 has \x037%{result}\x03: \x032%{build_url}\x03"
|
||||
|
||||
php:
|
||||
- '7.3'
|
||||
- '7.4'
|
||||
|
||||
addons:
|
||||
mariadb: '10.2'
|
||||
mariadb: '10.4'
|
||||
apt:
|
||||
packages:
|
||||
- curl
|
||||
@@ -32,23 +30,16 @@ addons:
|
||||
before_install:
|
||||
- sudo add-apt-repository ppa:ondrej/php -y
|
||||
- sudo apt-get -qq update
|
||||
- sudo apt-get install -y libsodium-dev
|
||||
- pecl install libsodium
|
||||
- mysql_upgrade -u root
|
||||
- composer validate
|
||||
|
||||
install:
|
||||
# Configure environment settings
|
||||
- cp .env.travis .env
|
||||
# Install composer packages.
|
||||
- composer global require hirak/prestissimo
|
||||
- composer install --prefer-dist
|
||||
|
||||
before_script:
|
||||
# Create mysql database and user.
|
||||
- mysql -u root -e "SET GLOBAL innodb_file_per_table = 1;"
|
||||
- mysql -u root -e "SET GLOBAL innodb_file_format = BARRACUDA;"
|
||||
- mysql -u root -e "SET GLOBAL innodb_large_prefix = 1;"
|
||||
- mysql -u root -e "CREATE DATABASE TEST;"
|
||||
- mysql -u root -e "GRANT ALL ON TEST.* TO 'TEST'@'localhost' IDENTIFIED BY 'TEST';"
|
||||
# Disable apparmor.
|
||||
|
||||
@@ -711,7 +711,7 @@ class Categorize
|
||||
*/
|
||||
public function isXxxUHD(): bool
|
||||
{
|
||||
if (preg_match('/XXX.+(2160p)+[\w\-.]+(M[PO][V4]-(KTR|GUSH|FaiLED|SEXORS|hUSHhUSH|YAPG))/i', $this->releaseName)) {
|
||||
if (preg_match('/XXX.+(2160p)+[\w\-.]+(M[PO][V4]-(KTR|GUSH|FaiLED|SEXORS|hUSHhUSH|YAPG|WRB|NBQ|FETiSH))/i', $this->releaseName)) {
|
||||
$this->tmpCat = Category::XXX_UHD;
|
||||
$this->tmpTag[] = Category::TAG_XXX_UHD;
|
||||
|
||||
@@ -726,7 +726,7 @@ class Categorize
|
||||
*/
|
||||
public function isXxxClipHD(): bool
|
||||
{
|
||||
if (preg_match('/^[\w\-.]+(\d{2}\.\d{2}\.\d{2}).+(720|1080)+[\w\-.]+(M[PO][V4]-(KTR|GUSH|FaiLED|SEXORS|hUSHhUSH|YAPG|TRASHBIN))/i', $this->releaseName)) {
|
||||
if (preg_match('/^[\w\-.]+(\d{2}\.\d{2}\.\d{2}).+(720|1080)+[\w\-.]+(M[PO][V4]-(KTR|GUSH|FaiLED|SEXORS|hUSHhUSH|YAPG|TRASHBIN|WRB|NBQ|FETiSH))/i', $this->releaseName)) {
|
||||
$this->tmpCat = Category::XXX_CLIPHD;
|
||||
$this->tmpTag[] = Category::TAG_XXX_CLIPHD;
|
||||
|
||||
|
||||
+1
-7
@@ -31,12 +31,6 @@
|
||||
"optimize-autoloader": true
|
||||
},
|
||||
"description": "A Usenet Indexer",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-dev": "1.x-dev"
|
||||
}
|
||||
|
||||
},
|
||||
"keywords": [
|
||||
"NNTmux",
|
||||
"newznab-tmux",
|
||||
@@ -100,7 +94,7 @@
|
||||
"dariusiii/token": "^3.0",
|
||||
"dariusiii/zipper": "^2.0",
|
||||
"dborsatto/php-giantbomb": "^2.0",
|
||||
"doctrine/dbal": "^2.7",
|
||||
"doctrine/dbal": "^3.0",
|
||||
"fakerphp/faker": "^1.12",
|
||||
"fideloper/proxy": "^4.2",
|
||||
"foolz/sphinxql-query-builder": "^2.0",
|
||||
|
||||
Generated
+128
-59
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "f507d2a8906f891af68933e1d18c169f",
|
||||
"content-hash": "6d5062cae91af70c99e6d07e39642b2c",
|
||||
"packages": [
|
||||
{
|
||||
"name": "aharen/omdbapi",
|
||||
@@ -786,17 +786,86 @@
|
||||
"time": "2020-08-23T12:54:47+00:00"
|
||||
},
|
||||
{
|
||||
"name": "cviebrock/laravel-elasticsearch",
|
||||
"version": "8.0.2",
|
||||
"name": "composer/package-versions-deprecated",
|
||||
"version": "1.11.99.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/cviebrock/laravel-elasticsearch.git",
|
||||
"reference": "de899cad8293de822d808ebf287cb924aeffaa2e"
|
||||
"url": "https://github.com/composer/package-versions-deprecated.git",
|
||||
"reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/cviebrock/laravel-elasticsearch/zipball/de899cad8293de822d808ebf287cb924aeffaa2e",
|
||||
"reference": "de899cad8293de822d808ebf287cb924aeffaa2e",
|
||||
"url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/7413f0b55a051e89485c5cb9f765fe24bb02a7b6",
|
||||
"reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer-plugin-api": "^1.1.0 || ^2.0",
|
||||
"php": "^7 || ^8"
|
||||
},
|
||||
"replace": {
|
||||
"ocramius/package-versions": "1.11.99"
|
||||
},
|
||||
"require-dev": {
|
||||
"composer/composer": "^1.9.3 || ^2.0@dev",
|
||||
"ext-zip": "^1.13",
|
||||
"phpunit/phpunit": "^6.5 || ^7"
|
||||
},
|
||||
"type": "composer-plugin",
|
||||
"extra": {
|
||||
"class": "PackageVersions\\Installer",
|
||||
"branch-alias": {
|
||||
"dev-master": "1.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"PackageVersions\\": "src/PackageVersions"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Marco Pivetta",
|
||||
"email": "ocramius@gmail.com"
|
||||
},
|
||||
{
|
||||
"name": "Jordi Boggiano",
|
||||
"email": "j.boggiano@seld.be"
|
||||
}
|
||||
],
|
||||
"description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://packagist.com",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/composer",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/composer/composer",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2020-11-11T10:22:58+00:00"
|
||||
},
|
||||
{
|
||||
"name": "cviebrock/laravel-elasticsearch",
|
||||
"version": "8.0.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/cviebrock/laravel-elasticsearch.git",
|
||||
"reference": "32ad18b0ad2315b3f0c3438a2c455e6cf383738a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/cviebrock/laravel-elasticsearch/zipball/32ad18b0ad2315b3f0c3438a2c455e6cf383738a",
|
||||
"reference": "32ad18b0ad2315b3f0c3438a2c455e6cf383738a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -850,7 +919,7 @@
|
||||
"laravel",
|
||||
"search"
|
||||
],
|
||||
"time": "2020-12-02T18:43:28+00:00"
|
||||
"time": "2020-12-28T18:49:27+00:00"
|
||||
},
|
||||
{
|
||||
"name": "czproject/git-php",
|
||||
@@ -1524,28 +1593,29 @@
|
||||
},
|
||||
{
|
||||
"name": "doctrine/dbal",
|
||||
"version": "2.12.1",
|
||||
"version": "3.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/dbal.git",
|
||||
"reference": "adce7a954a1c2f14f85e94aed90c8489af204086"
|
||||
"reference": "ee6d1260d5cc20ec506455a585945d7bdb98662c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/dbal/zipball/adce7a954a1c2f14f85e94aed90c8489af204086",
|
||||
"reference": "adce7a954a1c2f14f85e94aed90c8489af204086",
|
||||
"url": "https://api.github.com/repos/doctrine/dbal/zipball/ee6d1260d5cc20ec506455a585945d7bdb98662c",
|
||||
"reference": "ee6d1260d5cc20ec506455a585945d7bdb98662c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer/package-versions-deprecated": "^1.11.99",
|
||||
"doctrine/cache": "^1.0",
|
||||
"doctrine/event-manager": "^1.0",
|
||||
"ext-pdo": "*",
|
||||
"php": "^7.3 || ^8"
|
||||
"php": "^7.3 || ^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/coding-standard": "^8.1",
|
||||
"jetbrains/phpstorm-stubs": "^2019.1",
|
||||
"phpstan/phpstan": "^0.12.40",
|
||||
"phpstan/phpstan-strict-rules": "^0.12.2",
|
||||
"phpunit/phpunit": "^9.4",
|
||||
"psalm/plugin-phpunit": "^0.10.0",
|
||||
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
|
||||
@@ -1565,7 +1635,7 @@
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Doctrine\\DBAL\\": "lib/Doctrine/DBAL"
|
||||
"Doctrine\\DBAL\\": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
@@ -1608,7 +1678,6 @@
|
||||
"queryobject",
|
||||
"sasql",
|
||||
"sql",
|
||||
"sqlanywhere",
|
||||
"sqlite",
|
||||
"sqlserver",
|
||||
"sqlsrv"
|
||||
@@ -1627,7 +1696,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2020-11-14T20:26:58+00:00"
|
||||
"time": "2020-11-15T18:20:41+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/event-manager",
|
||||
@@ -1945,16 +2014,16 @@
|
||||
},
|
||||
{
|
||||
"name": "egulias/email-validator",
|
||||
"version": "2.1.24",
|
||||
"version": "2.1.25",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/egulias/EmailValidator.git",
|
||||
"reference": "ca90a3291eee1538cd48ff25163240695bd95448"
|
||||
"reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ca90a3291eee1538cd48ff25163240695bd95448",
|
||||
"reference": "ca90a3291eee1538cd48ff25163240695bd95448",
|
||||
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4",
|
||||
"reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2005,7 +2074,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2020-11-14T15:56:27+00:00"
|
||||
"time": "2020-12-29T14:50:06+00:00"
|
||||
},
|
||||
{
|
||||
"name": "elasticsearch/elasticsearch",
|
||||
@@ -3637,16 +3706,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/scout",
|
||||
"version": "v8.5.1",
|
||||
"version": "v8.5.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/scout.git",
|
||||
"reference": "b8b8a35cc3ac82cbc07dfa83955492d2ef6e237b"
|
||||
"reference": "ece6758b82c51ff7f5e011f243a7c6b33711a847"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/scout/zipball/b8b8a35cc3ac82cbc07dfa83955492d2ef6e237b",
|
||||
"reference": "b8b8a35cc3ac82cbc07dfa83955492d2ef6e237b",
|
||||
"url": "https://api.github.com/repos/laravel/scout/zipball/ece6758b82c51ff7f5e011f243a7c6b33711a847",
|
||||
"reference": "ece6758b82c51ff7f5e011f243a7c6b33711a847",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3698,7 +3767,7 @@
|
||||
"laravel",
|
||||
"search"
|
||||
],
|
||||
"time": "2020-12-22T17:29:20+00:00"
|
||||
"time": "2020-12-30T15:52:14+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/telescope",
|
||||
@@ -6178,16 +6247,16 @@
|
||||
},
|
||||
{
|
||||
"name": "propaganistas/laravel-disposable-email",
|
||||
"version": "2.0.13",
|
||||
"version": "2.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Propaganistas/Laravel-Disposable-Email.git",
|
||||
"reference": "568887f20f6325f289b3a685a4fc51d536d8ce44"
|
||||
"reference": "2c6f05e5731421e158c24a950c5d497bc5145e78"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Propaganistas/Laravel-Disposable-Email/zipball/568887f20f6325f289b3a685a4fc51d536d8ce44",
|
||||
"reference": "568887f20f6325f289b3a685a4fc51d536d8ce44",
|
||||
"url": "https://api.github.com/repos/Propaganistas/Laravel-Disposable-Email/zipball/2c6f05e5731421e158c24a950c5d497bc5145e78",
|
||||
"reference": "2c6f05e5731421e158c24a950c5d497bc5145e78",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -6197,7 +6266,7 @@
|
||||
"illuminate/contracts": "^6.0|^7.0|^8.0",
|
||||
"illuminate/support": "^6.0|^7.0|^8.0",
|
||||
"illuminate/validation": "^6.0|^7.0|^8.0",
|
||||
"php": ">=7.1|^8.0"
|
||||
"php": "^7.1|^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"mockery/mockery": "^1.3.3|^1.4.2",
|
||||
@@ -6238,7 +6307,7 @@
|
||||
"throwaway",
|
||||
"validator"
|
||||
],
|
||||
"time": "2020-12-01T08:38:01+00:00"
|
||||
"time": "2020-12-29T08:37:28+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/cache",
|
||||
@@ -7064,16 +7133,16 @@
|
||||
},
|
||||
{
|
||||
"name": "spatie/async",
|
||||
"version": "1.5.2",
|
||||
"version": "1.5.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/spatie/async.git",
|
||||
"reference": "e410c38a93b93589dfd8046b4b93cdaa6a9b7de2"
|
||||
"reference": "d371b76ff876530c4906596490fd977720477e48"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/spatie/async/zipball/e410c38a93b93589dfd8046b4b93cdaa6a9b7de2",
|
||||
"reference": "e410c38a93b93589dfd8046b4b93cdaa6a9b7de2",
|
||||
"url": "https://api.github.com/repos/spatie/async/zipball/d371b76ff876530c4906596490fd977720477e48",
|
||||
"reference": "d371b76ff876530c4906596490fd977720477e48",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -7123,7 +7192,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2020-11-20T06:05:35+00:00"
|
||||
"time": "2020-12-29T22:19:12+00:00"
|
||||
},
|
||||
{
|
||||
"name": "spatie/db-dumper",
|
||||
@@ -10872,44 +10941,44 @@
|
||||
"packages-dev": [
|
||||
{
|
||||
"name": "barryvdh/laravel-ide-helper",
|
||||
"version": "v2.8.2",
|
||||
"version": "v2.9.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/barryvdh/laravel-ide-helper.git",
|
||||
"reference": "5515cabea39b9cf55f98980d0f269dc9d85cfcca"
|
||||
"reference": "64a6b902583802c162cdccf7e76dc8619368bf1a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/5515cabea39b9cf55f98980d0f269dc9d85cfcca",
|
||||
"reference": "5515cabea39b9cf55f98980d0f269dc9d85cfcca",
|
||||
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/64a6b902583802c162cdccf7e76dc8619368bf1a",
|
||||
"reference": "64a6b902583802c162cdccf7e76dc8619368bf1a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"barryvdh/reflection-docblock": "^2.0.6",
|
||||
"composer/composer": "^1.6 || ^2",
|
||||
"doctrine/dbal": "~2.3",
|
||||
"doctrine/dbal": "^2.6 || ^3",
|
||||
"ext-json": "*",
|
||||
"illuminate/console": "^6 || ^7 || ^8",
|
||||
"illuminate/filesystem": "^6 || ^7 || ^8",
|
||||
"illuminate/support": "^6 || ^7 || ^8",
|
||||
"php": ">=7.2",
|
||||
"illuminate/console": "^8",
|
||||
"illuminate/filesystem": "^8",
|
||||
"illuminate/support": "^8",
|
||||
"php": "^7.3 || ^8.0",
|
||||
"phpdocumentor/type-resolver": "^1.1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-pdo_sqlite": "*",
|
||||
"friendsofphp/php-cs-fixer": "^2",
|
||||
"illuminate/config": "^6 || ^7 || ^8",
|
||||
"illuminate/view": "^6 || ^7 || ^8",
|
||||
"mockery/mockery": "^1.3.3",
|
||||
"orchestra/testbench": "^4 || ^5 || ^6",
|
||||
"illuminate/config": "^8",
|
||||
"illuminate/view": "^8",
|
||||
"mockery/mockery": "^1.4",
|
||||
"orchestra/testbench": "^6",
|
||||
"phpunit/phpunit": "^8.5 || ^9",
|
||||
"spatie/phpunit-snapshot-assertions": "^1.4 || ^2.2 || ^3 || ^4",
|
||||
"spatie/phpunit-snapshot-assertions": "^3 || ^4",
|
||||
"vimeo/psalm": "^3.12"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.8-dev"
|
||||
"dev-master": "2.9-dev"
|
||||
},
|
||||
"laravel": {
|
||||
"providers": [
|
||||
@@ -10950,7 +11019,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2020-12-06T08:55:05+00:00"
|
||||
"time": "2020-12-29T10:11:05+00:00"
|
||||
},
|
||||
{
|
||||
"name": "barryvdh/reflection-docblock",
|
||||
@@ -11690,16 +11759,16 @@
|
||||
},
|
||||
{
|
||||
"name": "facade/ignition",
|
||||
"version": "2.5.3",
|
||||
"version": "2.5.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/facade/ignition.git",
|
||||
"reference": "d8dc4f90ed469f9f9313b976fb078c20585d5c99"
|
||||
"reference": "8e907d81244649c5ea746e2ec30c32c5f59df472"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/facade/ignition/zipball/d8dc4f90ed469f9f9313b976fb078c20585d5c99",
|
||||
"reference": "d8dc4f90ed469f9f9313b976fb078c20585d5c99",
|
||||
"url": "https://api.github.com/repos/facade/ignition/zipball/8e907d81244649c5ea746e2ec30c32c5f59df472",
|
||||
"reference": "8e907d81244649c5ea746e2ec30c32c5f59df472",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -11757,7 +11826,7 @@
|
||||
"laravel",
|
||||
"page"
|
||||
],
|
||||
"time": "2020-12-09T20:25:45+00:00"
|
||||
"time": "2020-12-29T09:12:55+00:00"
|
||||
},
|
||||
{
|
||||
"name": "facade/ignition-contracts",
|
||||
|
||||
@@ -5,7 +5,7 @@ return [
|
||||
/*
|
||||
* Enable / disable Google2FA.
|
||||
*/
|
||||
'enabled' => env('OTP_ENABLED', true),
|
||||
'enabled' => env('OTP_ENABLED', false),
|
||||
|
||||
/*
|
||||
* Lifetime in minutes.
|
||||
@@ -48,7 +48,7 @@ return [
|
||||
/*
|
||||
* Forbid user to reuse One Time Passwords.
|
||||
*/
|
||||
'forbid_old_passwords' => true,
|
||||
'forbid_old_passwords' => false,
|
||||
|
||||
/*
|
||||
* User's table column for google2fa secret.
|
||||
|
||||
+6
-6
@@ -10,22 +10,22 @@
|
||||
stopOnFailure="false">
|
||||
<testsuites>
|
||||
<testsuite name="Install">
|
||||
<directory suffix="Test.php">./tests/Install</directory>
|
||||
<directory suffix="Test.php">tests/Install</directory>
|
||||
</testsuite>
|
||||
|
||||
<testsuite name="Unit">
|
||||
<directory suffix="Test.php">./tests/Unit</directory>
|
||||
<directory suffix="Test.php">tests/Unit</directory>
|
||||
</testsuite>
|
||||
|
||||
<testsuite name="Feature">
|
||||
<directory suffix="Test.php">./tests/Feature</directory>
|
||||
<directory suffix="Test.php">tests/Feature</directory>
|
||||
</testsuite>
|
||||
|
||||
</testsuites>
|
||||
<filter>
|
||||
<whitelist processUncoveredFilesFromWhitelist="true">
|
||||
<directory suffix=".php">./Blacklight</directory>
|
||||
<directory suffix=".php">./app</directory>
|
||||
<directory suffix=".php">Blacklight</directory>
|
||||
<directory suffix=".php">app</directory>
|
||||
</whitelist>
|
||||
</filter>
|
||||
<php>
|
||||
@@ -37,6 +37,6 @@
|
||||
<env name="MAIL_DRIVER" value="array"/>
|
||||
</php>
|
||||
<logging>
|
||||
<log type="coverage-clover" target="/build/logs/clover.xml"/>
|
||||
<log type="coverage-clover" target="tests/build/logs/clover.xml"/>
|
||||
</logging>
|
||||
</phpunit>
|
||||
|
||||
Reference in New Issue
Block a user