Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jenssegers/laravel-mongodb …
Browse files Browse the repository at this point in the history 
…into develop

* 'master' of https://github.com/jenssegers/laravel-mongodb: (98 commits)
  Report package version when establishing connection (mongodb#2507)
  Add missing return types
  Fix styleCI issues
  Fix auth test for Laravel 10
  Update tested PHP versions
  Remove dependency on doctrine/dbal
  Rename getBaseQuery method to toBase
  Remove deprecated PHPUnit call
  Update handling of dates for Laravel 10
  chore: disable php 8.0 in gh builds
  chore: update minimum stability
  Bump dependencies for Laravel 10
  fix: keep camel cased name except for `getMorphs`
  tests: for snake case morph relation name
  Add Geonear instructions to ReadMe. Closes mongodb#1878 (mongodb#2487)
  fix: whereBelongsTo (mongodb#2454)
  Transaction support (mongodb#2465)
  Use single connection using DSN for testing (mongodb#2462)
  Chore: add types where safe (mongodb#2464)
  Pass timeout in milliseconds (mongodb#2461)
  ...

# Conflicts:
#	composer.json
#	src/Eloquent/Builder.php
#	src/Eloquent/Model.php
  • Loading branch information
@aptcreativedesign
aptcreativedesign committed Feb 14, 2023
2 parents 10ebfdc + 7dab675 commit ba58266
Show file tree
Hide file tree
Showing 87 changed files with 2,683 additions and 884 deletions.
8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/QUESTION.md
View file

This file was deleted.

162 changes: 96 additions & 66 deletions .github/workflows/build-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,103 @@
name: CI

on:
push:
branches:
tags:
pull_request:
push:
branches:
tags:
pull_request:

jobs:
build:
runs-on: ${{matrix.os}}
strategy:
matrix:
php: ['7.2', '7.3', '7.4']
os: ['ubuntu-latest']
mongodb: ['3.6', '4.0', '4.2']
services:
mongo:
image: mongo:${{ matrix.mongodb }}
ports:
- 27017:27017
mysql:
image: mysql:5.7
ports:
- 3307:3306
php-cs-fixer:
runs-on: ubuntu-latest
env:
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MYSQL_DATABASE: 'unittest'
MYSQL_ROOT_PASSWORD:
name: PHP v${{ matrix.php }} with Mongo v${{ matrix.mongodb }}
PHP_CS_FIXER_VERSION: v3.6.0
strategy:
matrix:
php:
- '8.1'
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: curl,mbstring
tools: php-cs-fixer:${{ env.PHP_CS_FIXER_VERSION }}
coverage: none
- name: Run PHP-CS-Fixer Fix, version ${{ env.PHP_CS_FIXER_VERSION }}
run: php-cs-fixer fix --dry-run --diff --ansi

steps:
- uses: actions/checkout@v2
- name: "Installing php"
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: curl,mbstring,xdebug
coverage: xdebug
tools: composer
- name: Show PHP version
run: php -v && composer -V
- name: Show Docker version
run: if [[ "$DEBUG" == "true" ]]; then docker version && env; fi
env:
DEBUG: ${{secrets.DEBUG}}
- name: Download Composer cache dependencies from cache
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Cache Composer dependencies
uses: actions/cache@v1
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ matrix.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ matrix.os }}-composer-
- name: Install dependencies
run: |
composer install --no-interaction
- name: Run tests
run: |
./vendor/bin/phpunit --coverage-clover coverage.xml
env:
MONGO_HOST: 0.0.0.0
MYSQL_HOST: 0.0.0.0
MYSQL_PORT: 3307
- name: Send coveralls
run: vendor/bin/coveralls coverage.xml
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: false
build:
runs-on: ${{ matrix.os }}
name: PHP v${{ matrix.php }} with MongoDB ${{ matrix.mongodb }}
strategy:
matrix:
os:
- ubuntu-latest
mongodb:
- '4.0'
- '4.2'
- '4.4'
- '5.0'
php:
- '8.1'
- '8.2'
services:
mysql:
image: mysql:5.7
ports:
- 3307:3306
env:
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MYSQL_DATABASE: 'unittest'
MYSQL_ROOT_PASSWORD:

steps:
- uses: actions/checkout@v3
- name: Create MongoDB Replica Set
run: |
docker run --name mongodb -p 27017:27017 -e MONGO_INITDB_DATABASE=unittest --detach mongo:${{ matrix.mongodb }} mongod --replSet rs --setParameter transactionLifetimeLimitSeconds=5
until docker exec --tty mongodb mongo 127.0.0.1:27017 --eval "db.runCommand({ ping: 1 })"; do
sleep 1
done
sudo docker exec --tty mongodb mongo 127.0.0.1:27017 --eval "rs.initiate({\"_id\":\"rs\",\"members\":[{\"_id\":0,\"host\":\"127.0.0.1:27017\" }]})"
- name: Show MongoDB server status
run: |
docker exec --tty mongodb mongo 127.0.0.1:27017 --eval "db.runCommand({ serverStatus: 1 })"
- name: "Installing php"
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: curl,mbstring,xdebug
coverage: xdebug
tools: composer
- name: Show PHP version
run: php -v && composer -V
- name: Show Docker version
run: if [[ "$DEBUG" == "true" ]]; then docker version && env; fi
env:
DEBUG: ${{secrets.DEBUG}}
- name: Download Composer cache dependencies from cache
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Cache Composer dependencies
uses: actions/cache@v1
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ matrix.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ matrix.os }}-composer-
- name: Install dependencies
run: |
composer install --no-interaction
- name: Run tests
run: |
./vendor/bin/phpunit --coverage-clover coverage.xml
env:
MONGODB_URI: 'mongodb://127.0.0.1/?replicaSet=rs'
MYSQL_HOST: 0.0.0.0
MYSQL_PORT: 3307
- uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: false
15 changes: 9 additions & 6 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
.DS_Store
phpunit.phar
/vendor
composer.phar
composer.lock
*.project
*.sublime-project
*.sublime-workspace
*.project
.DS_Store
.idea/
.phpunit.result.cache
/.php-cs-fixer.php
/.php-cs-fixer.cache
/vendor
composer.lock
composer.phar
phpunit.phar
phpunit.xml
187 changes: 187 additions & 0 deletions .php-cs-fixer.dist.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
<?php

# Source: https://github.com/matt-allan/laravel-code-style/blob/main/src/Config.php

$rules = [
'@PSR2' => true,
'align_multiline_comment' => [
'comment_type' => 'phpdocs_like',
],
'ordered_imports' => [
'sort_algorithm' => 'alpha',
],
'array_indentation' => true,
'binary_operator_spaces' => [
'operators' => [
'=>' => null,
'=' => 'single_space',
],
],
'blank_line_after_namespace' => true,
'blank_line_after_opening_tag' => true,
'blank_line_before_statement' => [
'statements' => [
'return',
],
],
'cast_spaces' => true,
'class_definition' => false,
'clean_namespace' => true,
'compact_nullable_typehint' => true,
'concat_space' => [
'spacing' => 'none',
],
'declare_equal_normalize' => true,
'no_alias_language_construct_call' => true,
'elseif' => true,
'encoding' => true,
'full_opening_tag' => true,
'function_declaration' => true,
'function_typehint_space' => true,
'single_line_comment_style' => [
'comment_types' => [
'hash',
],
],
'heredoc_to_nowdoc' => true,
'include' => true,
'indentation_type' => true,
'integer_literal_case' => true,
'braces' => false,
'lowercase_cast' => true,
'constant_case' => [
'case' => 'lower',
],
'lowercase_keywords' => true,
'lowercase_static_reference' => true,
'magic_constant_casing' => true,
'magic_method_casing' => true,
'method_argument_space' => [
'on_multiline' => 'ignore',
],
'class_attributes_separation' => [
'elements' => [
'method' => 'one',
],
],
'visibility_required' => [
'elements' => [
'method',
'property',
],
],
'native_function_casing' => true,
'native_function_type_declaration_casing' => true,
'no_alternative_syntax' => true,
'no_binary_string' => true,
'no_blank_lines_after_class_opening' => true,
'no_blank_lines_after_phpdoc' => true,
'no_extra_blank_lines' => [
'tokens' => [
'throw',
'use',
'extra',
],
],
'no_closing_tag' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_multiline_whitespace_around_double_arrow' => true,
'multiline_whitespace_before_semicolons' => true,
'no_short_bool_cast' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_space_around_double_colon' => true,
'no_spaces_after_function_name' => true,
'no_spaces_around_offset' => [
'positions' => [
'inside',
],
],
'no_spaces_inside_parenthesis' => true,
'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_trailing_whitespace' => true,
'no_trailing_whitespace_in_comment' => true,
'no_unneeded_control_parentheses' => true,
'no_unneeded_curly_braces' => true,
'no_unset_cast' => true,
'no_unused_imports' => true,
'lambda_not_used_import' => true,
'no_useless_return' => true,
'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true,
'normalize_index_brace' => true,
'not_operator_with_successor_space' => true,
'object_operator_without_whitespace' => true,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => true,
'phpdoc_no_access' => true,
'phpdoc_no_package' => true,
'phpdoc_no_useless_inheritdoc' => true,
'phpdoc_return_self_reference' => true,
'phpdoc_scalar' => true,
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_trim' => true,
'phpdoc_no_alias_tag' => [
'replacements' => [
'type' => 'var',
],
],
'phpdoc_types' => true,
'phpdoc_var_without_name' => true,
'increment_style' => [
'style' => 'post',
],
'no_mixed_echo_print' => [
'use' => 'echo',
],
'return_type_declaration' => [
'space_before' => 'none',
],
'array_syntax' => [
'syntax' => 'short',
],
'list_syntax' => [
'syntax' => 'short',
],
'short_scalar_cast' => true,
'single_blank_line_at_eof' => true,
'single_blank_line_before_namespace' => true,
'single_class_element_per_statement' => true,
'single_import_per_statement' => true,
'single_line_after_imports' => true,
'single_quote' => true,
'space_after_semicolon' => true,
'standardize_not_equals' => true,
'switch_case_semicolon_to_colon' => true,
'switch_case_space' => true,
'switch_continue_to_break' => true,
'ternary_operator_spaces' => true,
'trailing_comma_in_multiline' => [
'elements' => [
'arrays',
],
],
'trim_array_spaces' => true,
'unary_operator_spaces' => true,
'types_spaces' => [
'space' => 'none',
],
'line_ending' => true,
'whitespace_after_comma_in_array' => true,
'no_alias_functions' => true,
'no_unreachable_default_argument_value' => true,
'psr_autoloading' => true,
'self_accessor' => true,
];

$finder = PhpCsFixer\Finder::create()
->in(__DIR__);

return (new PhpCsFixer\Config())
->setRiskyAllowed(true)
->setRules($rules)
->setFinder($finder);
1 change: 1 addition & 0 deletions .styleci.yml
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
risky: true
preset: laravel
Loading

0 comments on commit ba58266

Please sign in to comment.