Skip to content

Commit 437ed6d

Browse files
authored
Merge branch 'develop' into master
2 parents 66d045a + 283b3e6 commit 437ed6d

File tree

5 files changed

+5
-61
lines changed

5 files changed

+5
-61
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Phalcon CI](https://github.com/phalcon/traits/actions/workflows/main.yml/badge.svg?branch=1.x)](https://github.com/phalcon/traits/actions/workflows/main.yml)
44
[![PDS Skeleton](https://img.shields.io/badge/pds-skeleton-blue.svg?style=flat-square)](https://github.com/php-pds/skeleton)
5-
[![codecov](https://codecov.io/gh/phalcon/traits/branch/1.x/graph/badge.svg?token=I4bgs0E168)](https://codecov.io/gh/phalcon/traits)
6-
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/049cb6c1c06342579ebffb8e78ab9dd1)](https://www.codacy.com/gh/phalcon/traits/dashboard?utm_source=github.com&utm_medium=referral&utm_content=phalcon/traits&utm_campaign=Badge_Grade)
5+
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=phalcon_traits&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=phalcon_traits)
6+
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=phalcon_traits&metric=coverage)](https://sonarcloud.io/summary/new_code?id=phalcon_traits)
77

88
This package contains traits with methods that are used for Phalcon v6 onward.
99

codeception.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

config/.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
XDEBUG_MODE=coverage
1+
XDEBUG_MODE=coverage

config/phpcs.xml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,9 @@
44
<arg value="-colors"/>
55
<arg value="s"/>
66
<arg value="p"/>
7-
<arg name="parallel" value="75"/>
8-
97
<rule ref="PSR12">
10-
<type>error</type>
11-
<!-- <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>-->
8+
<exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
129
</rule>
13-
14-
<!-- Don't hide tokenizer exceptions -->
15-
<rule ref="Internal.Tokenizer.Exception">
16-
<type>error</type>
17-
</rule>
18-
19-
<!-- Ban some functions -->
20-
<rule ref="Generic.PHP.ForbiddenFunctions">
21-
<properties>
22-
<property name="forbiddenFunctions" type="array">
23-
<element key="sizeof" value="count"/>
24-
<element key="delete" value="unset"/>
25-
<element key="print" value="echo"/>
26-
<element key="is_null" value="null"/>
27-
<element key="create_function" value="null"/>
28-
</property>
29-
</properties>
30-
</rule>
31-
3210
<file>../src</file>
3311
<file>../tests/unit</file>
3412
</ruleset>

src/Helper/Str/UncamelizeTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ trait UncamelizeTrait
2020
{
2121
/**
2222
* @param string $text
23-
* @param string $delimiters
23+
* @param string $delimiter
2424
*
2525
* @return string
2626
*/

0 commit comments

Comments
 (0)