Skip to content

Commit

Permalink
Merge pull request #4 from Kaapiii/develop
Browse files Browse the repository at this point in the history
Merge branch 'develop'
  • Loading branch information
Kaapiii authored Jun 4, 2023
2 parents c877942 + 5cdc7fc commit 7ad19ed
Show file tree
Hide file tree
Showing 7 changed files with 285 additions and 125 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
/.gitattributes export-ignore
/.gitignore export-ignore
/LICENSE export-ignore
/README.md export-ignore
/README.md export-ignore
.php-cs.php
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/vendor/*
!/vendor/.gitignore
composer.lock
.php-cs-fixer.cache
158 changes: 158 additions & 0 deletions .php-cs.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<?php

return (new PhpCsFixer\Config())
->setRiskyAllowed(true)
->setRules([
'array_syntax' => true,
'assign_null_coalescing_to_coalesce_equal' => true,
'backtick_to_shell_exec' => true,
'binary_operator_spaces' => true,
'blank_line_after_namespace' => true,
'blank_line_after_opening_tag' => true,
'blank_line_before_statement' => true,
'blank_line_between_import_groups' => true,
'braces' => true,
'cast_spaces' => true,
'class_attributes_separation' => true,
'class_definition' => true,
'class_reference_name_casing' => true,
'clean_namespace' => true,
'compact_nullable_typehint' => true,
'concat_space' => ['spacing'=>'one'],
'constant_case' => true,
'declare_equal_normalize' => true,
'echo_tag_syntax' => true,
'elseif' => true,
'empty_loop_body' => true,
'empty_loop_condition' => true,
'encoding' => true,
'full_opening_tag' => true,
'fully_qualified_strict_types' => false,
'function_declaration' => false,
'function_typehint_space' => true,
'general_phpdoc_tag_rename' => true,
'heredoc_indentation' => true,
'include' => true,
'increment_style' => true,
'indentation_type' => true,
'integer_literal_case' => true,
'lambda_not_used_import' => true,
'line_ending' => true,
'linebreak_after_opening_tag' => true,
'list_syntax' => true,
'lowercase_cast' => true,
'lowercase_keywords' => true,
'lowercase_static_reference' => true,
'magic_constant_casing' => true,
'magic_method_casing' => true,
'method_argument_space' => true,
'native_function_casing' => true,
'native_function_type_declaration_casing' => true,
'new_with_braces' => true,
'no_alias_language_construct_call' => true,
'no_alternative_syntax' => true,
'no_binary_string' => true,
'no_blank_lines_after_class_opening' => true,
'no_blank_lines_after_phpdoc' => true,
'no_break_comment' => true,
'no_closing_tag' => true,
'no_empty_comment' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_extra_blank_lines' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_mixed_echo_print' => true,
'no_multiline_whitespace_around_double_arrow' => 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' => true,
'no_spaces_inside_parenthesis' => true,
'no_superfluous_phpdoc_tags' => true,
'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_trailing_comma_in_singleline_function_call' => true,
'no_trailing_whitespace' => true,
'no_trailing_whitespace_in_comment' => true,
'no_unneeded_control_parentheses' => true,
'no_unneeded_curly_braces' => true,
'no_unneeded_import_alias' => true,
'no_unset_cast' => true,
'no_unused_imports' => true,
'no_useless_nullsafe_operator' => true,
'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true,
'normalize_index_brace' => true,
'object_operator_without_whitespace' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'php_unit_fqcn_annotation' => true,
'php_unit_method_casing' => true,
'phpdoc_align' => true,
'phpdoc_annotation_without_dot' => true,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => true,
'phpdoc_no_access' => true,
'phpdoc_no_alias_tag' => true,
'phpdoc_no_package' => true,
'phpdoc_no_useless_inheritdoc' => true,
'phpdoc_return_self_reference' => true,
'phpdoc_scalar' => true,
'phpdoc_separation' => true,
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_tag_type' => true,
'phpdoc_to_comment' => true,
'phpdoc_trim' => true,
'phpdoc_trim_consecutive_blank_line_separation' => true,
'phpdoc_types' => true,
'phpdoc_types_order' => true,
'phpdoc_var_without_name' => true,
'protected_to_private' => true,
'return_type_declaration' => true,
'semicolon_after_instruction' => true,
'short_scalar_cast' => true,
'simple_to_complex_string_variable' => 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_line_comment_spacing' => true,
'single_line_comment_style' => true,
'single_line_throw' => true,
'single_quote' => true,
'single_space_after_construct' => true,
'single_trait_insert_per_statement' => true,
'space_after_semicolon' => true,
'standardize_increment' => true,
'standardize_not_equals' => true,
'switch_case_semicolon_to_colon' => true,
'switch_case_space' => true,
'switch_continue_to_break' => true,
'ternary_operator_spaces' => true,
'ternary_to_null_coalescing' => true,
'trailing_comma_in_multiline' => true,
'trim_array_spaces' => true,
'types_spaces' => true,
'unary_operator_spaces' => true,
'visibility_required' => true,
'whitespace_after_comma_in_array' => true,
'yoda_style' => true,
])
->setFinder(
PhpCsFixer\Finder::create()
->exclude(
[
'vendor',
'single_pages'
]
)
->in(
[
__DIR__
]
)
);
23 changes: 8 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
[![SensioLabsInsight](https://insight.sensiolabs.com/projects/86a71f44-22ed-46e6-9fc7-d7d3ca79815e/mini.png)](https://insight.sensiolabs.com/projects/86a71f44-22ed-46e6-9fc7-d7d3ca79815e)

Concrete5 package for v8 - Adds beberlei/DoctrineExtensions to concrete5
Concrete CMS Package (v8/v9): Doctrine DQL Extentsions
======
Adds beberlei/DoctrineExtensions to Concrete CMS

Installation
------------------

### Install the package with the projects composer.json file

1. Run the following command from the installation {root} folder to get the latest version


composer require kaapiii/concrete5_doctrine_dql_extensions


2. Add the following line to the 'require' section of the concrete5 composer.json file


"kaapiii/concrete5_doctrine_dql_extensions": "^1.1"
1. Run the following command from the installation **{root}** folder to get the latest version.

```shell
composer require kaapiii/concrete5_doctrine_dql_extensions
```
3. Install the package
4. Navigate to **System & Settings -> Doctrine DQL Extensions** to see the available DQL functions. You can now use the most common MySQL functions in your DQL queries and in the QueryBuilder.
2. Install the package
3. Navigate to **System & Settings -> Doctrine DQL Extensions** to see the available DQL functions. You can now use the most common MySQL functions in your DQL queries and in the QueryBuilder.

![screenshot](https://user-images.githubusercontent.com/995643/68252188-23a49500-0025-11ea-8a64-fb6329970608.png)
13 changes: 11 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,19 @@
}
],
"config": {
"vendor-dir":"./vendor"
"vendor-dir":"./vendor",
"allow-plugins": {
"composer/installers": true
}
},
"require": {
"composer/installers": "~1.0",
"beberlei/doctrineextensions": "1.1.9"
"beberlei/doctrineextensions": "^1.1.9"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.17"
},
"scripts": {
"csfixer": "vendor/bin/php-cs-fixer fix --config .php-cs.php"
}
}
Loading

0 comments on commit 7ad19ed

Please sign in to comment.