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.

Sign up for GitHub

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

Fix method visibility #2

Merged
merged 3 commits into from
Jun 6, 2024
Merged

Fix method visibility #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dfb529
Fix method visibility
tarecord Jun 4, 2024
e6cc391
Ensure composer requires illuminate/collections
tarecord Jun 6, 2024
b4edc8d
Try fixing slic composer install
tarecord Jun 6, 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
2 changes: 1 addition & 1 deletion .github/workflows/tests-php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ jobs:
- name: Set up StellarWP Arrays
run: |
${SLIC_BIN} use arrays
${SLIC_BIN} composer install --ignore-platform-reqs
${SLIC_BIN} composer install
- name: Run suite wpunit
run: ${SLIC_BIN} run ${{ matrix.suite }} --ext DotReporter
4 changes: 3 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
}
],
"minimum-stability": "stable",
"require": {},
"require": {
"illuminate/collections": "^8.0"
},
"require-dev": {
"codeception/module-asserts": "^1.0",
"codeception/module-cli": "^1.0",
Expand Down
6 changes: 3 additions & 3 deletions src/Arrays/Arr.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public static function except( $array, $keys ) {
/**
* Determine if the given key exists in the provided array.
*
* @param \ArrayAccess|array $array
* @param \ArrayAccess|Enumerable|array $array
* @param string|int|float $key
*
* @return bool
Expand Down Expand Up @@ -790,7 +790,7 @@ public static function map_or_discard( $keys, array $map, bool &$found = true )
*
* @return array
*/
function merge_recursive( array &$array1, array &$array2 ): array {
public static function merge_recursive( array &$array1, array &$array2 ): array {
$merged = $array1;

foreach ( $array2 as $key => &$value ) {
Expand Down Expand Up @@ -1176,7 +1176,7 @@ public static function sort_by_priority( $array ): array {
*
* @return int
*/
protected static function sort_by_priority_comparison( $a, $b ): int {
public static function sort_by_priority_comparison( $a, $b ): int {
if ( is_array( $a ) ) {
$a_priority = $a['priority'];
} else {
Expand Down
Loading