Skip to content

Commit c4a1105

Browse files
author
Fredrick Peter
committed
conflicts using with Laravel
1 parent 901f9d1 commit c4a1105

File tree

10 files changed

+575
-252
lines changed

10 files changed

+575
-252
lines changed

README.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,6 @@ Support Package For Tamedevelopers
3030

3131
Prior to installing `support package` get the [Composer](https://getcomposer.org) dependency manager for PHP because it'll simplify installation.
3232

33-
**Step 1** — update your `composer.json`:
34-
```composer.json
35-
"require": {
36-
"tamedevelopers/support": "^1.0.3"
37-
}
38-
```
39-
40-
**Step 2** — run [Composer](https://getcomposer.org):
41-
```update
42-
composer update
43-
```
44-
45-
**Or composer require**:
4633
```
4734
composer require peterson/database
4835
```

Server.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@ class Server{
1515
/**
1616
* Get the value of a configuration option.
1717
*
18-
* @param string $key
18+
* @param mixed $key
1919
* The configuration key in dot notation (e.g., 'database.connections.mysql')
2020
*
2121
* @param mixed $default
2222
* [optional] The default value to return if the configuration option is not found
2323
*
24-
* @param mixed $folder
24+
* @param string $base_folder
2525
* [optional] Custom base folder after the base_path()
2626
* - Default base for config() is 'config' folder.
2727
*
2828
* @return mixed
2929
* The value of the configuration option, or null if it doesn't exist
3030
*/
31-
public static function config(string $key, $default = null, string $folder = null)
31+
public static function config($key, $default = null, string $base_folder = null)
3232
{
3333
// Convert the key to an array
3434
$parts = explode('.', $key);
3535

3636
// Get the file name
37-
$filePath = base_path("{$folder}/{$parts[0]}.php");
37+
$filePath = base_path("{$base_folder}/{$parts[0]}.php");
3838

3939
// Check if the configuration file exists
4040
if (file_exists($filePath)) {

0 commit comments

Comments
 (0)