Skip to content

Commit e709f4e

Browse files
committed
Patch framework (v4.6.0 => v4.6.1)
1 parent 08420be commit e709f4e

File tree

10 files changed

+18
-19
lines changed

10 files changed

+18
-19
lines changed

app/Config/Autoload.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
*
1818
* NOTE: This class is required prior to Autoloader instantiation,
1919
* and does not extend BaseConfig.
20-
*
21-
* @immutable
2220
*/
2321
class Autoload extends AutoloadConfig
2422
{

app/Config/Cache.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ class Cache extends BaseConfig
107107
* -------------------------------------------------------------------------
108108
* Redis settings
109109
* -------------------------------------------------------------------------
110+
*
110111
* Your Redis server can be specified below, if you are using
111112
* the Redis or Predis drivers.
112113
*

app/Config/DocTypes.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
namespace Config;
44

5-
/**
6-
* @immutable
7-
*/
85
class DocTypes
96
{
107
/**

app/Config/Mimes.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace Config;
44

55
/**
6-
* Mimes
7-
*
86
* This file contains an array of mime types. It is used by the
97
* Upload class to help identify allowed file types.
108
*
@@ -15,8 +13,6 @@
1513
*
1614
* When working with mime types, please make sure you have the ´fileinfo´
1715
* extension enabled to reliably detect the media types.
18-
*
19-
* @immutable
2016
*/
2117
class Mimes
2218
{
@@ -482,6 +478,8 @@ class Mimes
482478
'application/sla',
483479
'application/vnd.ms-pki.stl',
484480
'application/x-navistyle',
481+
'model/stl',
482+
'application/octet-stream',
485483
],
486484
];
487485

app/Config/Modules.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
*
1010
* NOTE: This class is required prior to Autoloader instantiation,
1111
* and does not extend BaseConfig.
12-
*
13-
* @immutable
1412
*/
1513
class Modules extends BaseModules
1614
{

app/Config/Optimize.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
*
88
* NOTE: This class does not extend BaseConfig for performance reasons.
99
* So you cannot replace the property values with Environment Variables.
10-
*
11-
* @immutable
1210
*/
1311
class Optimize
1412
{

app/Config/Paths.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
* share a system folder between multiple applications, and more.
1313
*
1414
* All paths are relative to the project's root folder.
15+
*
16+
* NOTE: This class is required prior to Autoloader instantiation,
17+
* and does not extend BaseConfig.
1518
*/
1619
class Paths
1720
{

app/Views/errors/html/debug.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--main-text-color: #555;
44
--dark-text-color: #222;
55
--light-text-color: #c7c7c7;
6-
--brand-primary-color: #E06E3F;
6+
--brand-primary-color: #DC4814;
77
--light-bg-color: #ededee;
88
--dark-bg-color: #404040;
99
}
@@ -71,7 +71,7 @@ p.lead {
7171
text-align: center;
7272
padding: calc(4px + 0.2083vw);
7373
width: 100%;
74-
margin-top: -2.14rem;
74+
top: 0;
7575
position: fixed;
7676
}
7777

public/index.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?php
22

3+
use CodeIgniter\Boot;
4+
use Config\Paths;
5+
36
/*
47
*---------------------------------------------------------------
58
* CHECK PHP VERSION
@@ -48,9 +51,9 @@
4851
require FCPATH . '../app/Config/Paths.php';
4952
// ^^^ Change this line if you move your application folder
5053

51-
$paths = new Config\Paths();
54+
$paths = new Paths();
5255

5356
// LOAD THE FRAMEWORK BOOTSTRAP FILE
5457
require $paths->systemDirectory . '/Boot.php';
5558

56-
exit(CodeIgniter\Boot::bootWeb($paths));
59+
exit(Boot::bootWeb($paths));

spark

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
* the LICENSE file that was distributed with this source code.
1111
*/
1212

13+
use CodeIgniter\Boot;
14+
use Config\Paths;
15+
1316
/*
1417
* --------------------------------------------------------------------
1518
* CODEIGNITER COMMAND-LINE TOOLS
@@ -76,9 +79,9 @@ chdir(FCPATH);
7679
require FCPATH . '../app/Config/Paths.php';
7780
// ^^^ Change this line if you move your application folder
7881

79-
$paths = new Config\Paths();
82+
$paths = new Paths();
8083

8184
// LOAD THE FRAMEWORK BOOTSTRAP FILE
8285
require $paths->systemDirectory . '/Boot.php';
8386

84-
exit(CodeIgniter\Boot::bootSpark($paths));
87+
exit(Boot::bootSpark($paths));

0 commit comments

Comments
 (0)