Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Composer Tweak #6

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d04f34f
Updating PHP versions
mambax7 Jun 16, 2024
c0250bc
travis update
mambax7 Jun 30, 2024
5c3d518
Yoda
mambax7 Jun 30, 2024
2a0fc83
add check for is_string($curlReturn)
mambax7 Jun 30, 2024
b03ca4a
improved decodePunycode()
mambax7 Jun 30, 2024
1fb3cfb
Redundant 'else' keyword
mambax7 Jun 30, 2024
29e8ca3
The type PHPUnit_Framework_TestCase was not found.
mambax7 Jun 30, 2024
df00e9d
Type cast is redundant
mambax7 Jun 30, 2024
1e83a86
replace Geekwright\RegDom with Xoops\RegDom
mambax7 Jun 30, 2024
7ce0ea9
short array syntax
mambax7 Jun 30, 2024
dd7886e
short array syntax
mambax7 Jun 30, 2024
564f69f
cosmetics, compatibility
mambax7 Jun 30, 2024
f491ac6
code improvements
mambax7 Jun 30, 2024
2c43cf9
data updates
mambax7 Jun 30, 2024
08763e7
Untrusted files inclusion
mambax7 Jun 30, 2024
23b115f
Unnecessary double quotes
mambax7 Jun 30, 2024
1f573c2
Yoda
mambax7 Jun 30, 2024
7448414
PHPUnit: better assertion
mambax7 Jun 30, 2024
d9604f6
data update
mambax7 Jun 30, 2024
86cf6be
code improvement
mambax7 Jun 30, 2024
7b3b243
Delete /archive
mambax7 Jul 1, 2024
c409266
update version
mambax7 Jul 1, 2024
c573cd5
changed to Xoops
mambax7 Jul 1, 2024
1d51935
remove PHP_VERSION_ID < 70000
mambax7 Jul 1, 2024
84caf85
updating data/public_suffix_list.dat
mambax7 Jul 1, 2024
ceb6811
type hinting
mambax7 Jul 1, 2024
0981904
Scrutinizer
mambax7 Jul 1, 2024
1ce07f7
github workflows
mambax7 Jul 1, 2024
e04fbb9
Unqualified function/constant reference
mambax7 Jul 1, 2024
c283a29
remove '\'
mambax7 Jul 1, 2024
62dbca2
Merge pull request #1 from XOOPS/feature/2512
geekwright Jul 6, 2024
90aa3b1
Tweak composer
geekwright Jul 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
* text=auto

/archive export-ignore
/_archive export-ignore
/tests export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.scrutinizer.yml export-ignore
.travis.yml export-ignore
phpcs.xml.dist export-ignore
phpunit.xml.dist export-ignore
64 changes: 64 additions & 0 deletions .github/workflows/pr_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: CI

on: [push, pull_request]

jobs:
phpunit-9-6:
strategy:
fail-fast: false
matrix:
php_version: ["7.4", "8.1", "8.2", "8.3"]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: php-actions/composer@v6
with:
php_version: "7.4"
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php_version }}
coverage: xdebug
- name: Unit Tests with PHPUnit 9.6
run: vendor/bin/phpunit --stderr --version 9.6

phpunit-10-5:
strategy:
fail-fast: false
matrix:
php_version: ["8.1", "8.2", "8.3"]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: php-actions/composer@v6
with:
php_version: "8.1"
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php_version }}
coverage: xdebug
- name: Unit Tests with PHPUnit 10.5
run: vendor/bin/phpunit --stderr --version 10.5

phpunit-11-2:
strategy:
fail-fast: false
matrix:
php_version: ["8.2", "8.3"]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: php-actions/composer@v6
with:
php_version: "8.2"
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php_version }}
coverage: xdebug
- name: Unit Tests with PHPUnit 11.2
run: vendor/bin/phpunit --stderr --version 11.2
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
\#*
*.bak
.idea/
coverage.clover
vendor/
composer.lock
coverage.clover
git-phpcs.phar
15 changes: 14 additions & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
# .scrutinizer.yml
build:
nodes:
analysis:
environment:
php:
version: 7.4
project_setup:
override: true
tests:
override:
- php-scrutinizer-run
- php-scrutinizer-run
filter:
excluded_paths:
- '_archive/*'
- 'tests/*'
tools:
external_code_coverage:
timeout: 300 # Timeout in seconds.
26 changes: 10 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
language: php

php:
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4snapshot
- 7.4
- 8.0
- 8.1
- 8.2
- 8.3

matrix:
include:
- php: 5.3
dist: precise
- php: 5.4
dist: trusty
- php: 5.5
dist: trusty
jobs:
allow_failures:
- php: nightly
include:
- php: nightly

install:
- composer install
Expand All @@ -26,5 +20,5 @@ script:
- vendor/bin/phpunit

after_script:
- if [ "$TRAVIS_PHP_VERSION" != "7.4snapshot" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [ "$TRAVIS_PHP_VERSION" != "7.4snapshot" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
- if [[ "$TRAVIS_PHP_VERSION" != "8.3" && "$TRAVIS_PHP_VERSION" != "nightly" ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [[ "$TRAVIS_PHP_VERSION" != "8.3" && "$TRAVIS_PHP_VERSION" != "nightly" ]]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ the list, please see [publicsuffix.org](https://publicsuffix.org/)

# Installation

> composer require geekwright/regdom
> composer require xoops/regdom

# Usage

## Class Geekwright\RegDom\PublicSuffixList
## Class Xoops\RegDom\PublicSuffixList
This class handles all direct interaction with the public suffix list (PSL.)
This includes, fetching the list from a source URL, caching that list
locally, converting that list to a tree form to facilitate rapid lookup,
Expand All @@ -27,15 +27,15 @@ https://publicsuffix.org/list/public_suffix_list.dat
Resets the current PSL, and uses the specified URL as the source.

### $psl->getTree()
Returns the tree of the current PSL. `Geekwright\RegDom\RegisteredDomain`
Returns the tree of the current PSL. `Xoops\RegDom\RegisteredDomain`
uses this tree form for all lookups.

### $psl->clearDataDirectory(*$cacheOnly*)
By default, this will clear all cached PSL data, including local copies
of remotely accessed PSL data. Pass *true* for `$cacheOnly` to clear only
the serialized tree data.

## Class Geekwright\RegDom\RegisteredDomain
## Class Xoops\RegDom\RegisteredDomain
This class can be used to determine the registrable domain portion of a
URL, respecting the public suffix list conventions.

Expand Down
Loading
Loading