From 44b2058fbcd37593a606ff39c35eec717dc4c436 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Mon, 1 Aug 2022 10:05:19 +1200
Subject: [PATCH 1/2] MNT Standardise modules

---
 .codecov.yml |  3 ---
 .travis.yml  | 46 ----------------------------------------------
 README.md    | 14 ++++----------
 3 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100644 .codecov.yml
 delete mode 100644 .travis.yml

diff --git a/.codecov.yml b/.codecov.yml
deleted file mode 100644
index 9e7c83829..000000000
--- a/.codecov.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-comment: false
-codecov:
-  branch: master
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b716e10cf..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-version: ~> 1.0
-
-import:
-  - silverstripe/silverstripe-travis-shared:config/provision/standard.yml
-
-env:
-  global:
-    - REQUIRE_RECIPE="4.10.x-dev"
-
-# Using a manual matrix to exlude PHPUNIT_COVERAGE_TEST for now because it was causing some strange issues
-# e.g. https://travis-ci.com/github/silverstripe/silverstripe-framework/jobs/457096837
-jobs:
-  fast_finish: true
-  include:
-    - php: 7.3
-      env:
-        - DB=MYSQL
-        - REQUIRE_INSTALLER="$REQUIRE_RECIPE"
-        - PHPCS_TEST=1
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="framework"
-        - COMPOSER_INSTALL_ARG="--prefer-lowest"
-    - php: 7.4
-      env:
-        - DB=PGSQL
-        - REQUIRE_INSTALLER="$REQUIRE_RECIPE"
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="framework"
-    - php: 7.4
-      env:
-        - DB=MYSQL
-        - REQUIRE_INSTALLER="$REQUIRE_RECIPE"
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="cms"
-    - php: 7.4
-      env:
-        - DB=MYSQL
-        - REQUIRE_INSTALLER="$REQUIRE_RECIPE"
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="framework"
-    - php: 8.0
-      env:
-        - DB=MYSQL
-        - REQUIRE_INSTALLER="$REQUIRE_RECIPE"
-        - PHPUNIT_TEST=1
-        - PHPUNIT_SUITE="framework"
diff --git a/README.md b/README.md
index 327ea656c..b709774f9 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,9 @@
-## SilverStripe Framework
+## Silverstripe Framework
 
 [![CI](https://github.com/silverstripe/silverstripe-framework/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-framework/actions/workflows/ci.yml)
-[![Build Docs](https://github.com/silverstripe/silverstripe-framework/workflows/Build%20Docs/badge.svg)](https://docs.silverstripe.org/)
-[![Latest Stable Version](https://poser.pugx.org/silverstripe/framework/version.svg)](https://www.silverstripe.org/stable-download/)
-[![Latest Unstable Version](https://poser.pugx.org/silverstripe/framework/v/unstable.svg)](https://packagist.org/packages/silverstripe/framework)
-[![codecov](https://codecov.io/gh/silverstripe/silverstripe-framework/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-framework)
-[![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
-[![Total Downloads](https://poser.pugx.org/silverstripe/framework/downloads.svg)](https://packagist.org/packages/silverstripe/framework)
-[![License](https://poser.pugx.org/silverstripe/framework/license.svg)](https://github.com/silverstripe/silverstripe-framework#license)
+[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
 
-PHP framework forming the base for the SilverStripe CMS ([https://silverstripe.org](https://silverstripe.org)). 
+PHP framework forming the base for the Silverstripe CMS ([https://silverstripe.org](https://silverstripe.org)). 
 Requires a [`silverstripe-installer`](https://github.com/silverstripe/silverstripe-installer) base project. Typically used alongside the [`cms`](https://github.com/silverstripe/silverstripe-cms) module.
 
 ## Installation ##
@@ -24,7 +18,7 @@ Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/co
 
 ## Development and Contribution ##
 
-If you would like to make changes to the SilverStripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/contributing/code/).
+If you would like to make changes to the Silverstripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/contributing/code/).
 
 ## Links ##
 

From 6b15bd6dd4ffe0191756418f79e938dfab876d28 Mon Sep 17 00:00:00 2001
From: Loz Calver <lozcalver@bigfork.co.uk>
Date: Mon, 1 Aug 2022 09:08:52 +0100
Subject: [PATCH 2/2] FIX: Invalid argument warning in backtrace

---
 src/Dev/Backtrace.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dev/Backtrace.php b/src/Dev/Backtrace.php
index 9139534f4..17006751e 100644
--- a/src/Dev/Backtrace.php
+++ b/src/Dev/Backtrace.php
@@ -122,7 +122,7 @@ class Backtrace
                 }
             }
             if ($match) {
-                foreach ($bt[$i]['args'] as $j => $arg) {
+                foreach ($bt[$i]['args'] ?? [] as $j => $arg) {
                     $bt[$i]['args'][$j] = '<filtered>';
                 }
             }