From c6848e99a436cbf5134b866dca0db9122d18a938 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 7 May 2021 21:37:10 -0600
Subject: [PATCH] Add helpers

---
 app/helpers.php |   9 +++
 composer.json   | 185 ++++++++++++++++++++++++------------------------
 2 files changed, 103 insertions(+), 91 deletions(-)
 create mode 100644 app/helpers.php

diff --git a/app/helpers.php b/app/helpers.php
new file mode 100644
index 000000000..eddc95f96
--- /dev/null
+++ b/app/helpers.php
@@ -0,0 +1,9 @@
+<?php
+
+use App\Services\ConfigCacheService;
+
+if (!function_exists('config_cache')) {
+	function config_cache($key) {
+		return ConfigCacheService::get($key);
+	}
+}
diff --git a/composer.json b/composer.json
index 2b5f8cdd4..99b9604a9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,93 +1,96 @@
 {
-    "name": "pixelfed/pixelfed",
-    "description": "Open and ethical photo sharing platform, powered by ActivityPub federation.",
-    "keywords": ["framework", "laravel", "pixelfed", "activitypub", "social", "network", "federation"],
-    "license": "AGPL-3.0-only",
-    "type": "project",
-    "require": {
-        "php": "^7.3",
-        "ext-bcmath": "*",
-        "ext-ctype": "*",
-        "ext-curl": "*",
-        "ext-intl": "*",
-        "ext-json": "*",
-        "ext-mbstring": "*",
-        "ext-openssl": "*",
-        "beyondcode/laravel-self-diagnosis": "^1.0.2",
-        "brick/math": "^0.8",
-        "buzz/laravel-h-captcha": "1.0.2",
-        "doctrine/dbal": "^2.7",
-        "fideloper/proxy": "^4.0",
-        "fruitcake/laravel-cors": "^2.0",
-        "intervention/image": "^2.4",
-        "jenssegers/agent": "^2.6",
-        "laravel/framework": "^8.0",
-        "laravel/helpers": "^1.1",
-        "laravel/horizon": "^5.0",
-        "laravel/passport": "^10.0",
-        "laravel/tinker": "^2.0",
-        "laravel/ui": "^2.0",
-        "league/flysystem-aws-s3-v3": "~1.0",
-        "league/flysystem-cached-adapter": "~1.0",
-        "league/iso3166": "^2.1",
-        "pbmedia/laravel-ffmpeg": "^7.0",
-        "phpseclib/phpseclib": "~2.0",
-        "bacon/bacon-qr-code": "^2.0.3",
-        "pixelfed/fractal": "^0.18.0",
-        "pragmarx/google2fa": "^8.0",
-        "pixelfed/laravel-snowflake": "^2.0",
-        "pixelfed/zttp": "^0.4",
-        "predis/predis": "^1.1",
-        "spatie/laravel-backup": "^6.0.0",
-        "spatie/laravel-image-optimizer": "^1.1",
-        "stevebauman/purify": "3.0.*",
-        "symfony/http-kernel": "5.1.5"
-    },
-    "require-dev": {
-        "brianium/paratest": "^6.1",
-        "facade/ignition": "^2.3.6",
-        "fzaninotto/faker": "^1.4",
-        "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.0"
-    },
-    "autoload": {
-        "classmap": [
-            "database/seeds",
-            "database/factories"
-        ],
-        "psr-4": {
-            "App\\": "app/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
-    "extra": {
-        "laravel": {
-            "dont-discover": [
-            ]
-        }
-    },
-    "scripts": {
-        "post-root-package-install": [
-            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-        ],
-        "post-create-project-cmd": [
-            "@php artisan key:generate --ansi"
-        ],
-        "post-autoload-dump": [
-            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover --ansi"
-        ]
-    },
-    "config": {
-        "preferred-install": "dist",
-        "sort-packages": true,
-        "optimize-autoloader": true
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+	"name": "pixelfed/pixelfed",
+	"description": "Open and ethical photo sharing platform, powered by ActivityPub federation.",
+	"keywords": ["framework", "laravel", "pixelfed", "activitypub", "social", "network", "federation"],
+	"license": "AGPL-3.0-only",
+	"type": "project",
+	"require": {
+		"php": "^7.3",
+		"ext-bcmath": "*",
+		"ext-ctype": "*",
+		"ext-curl": "*",
+		"ext-intl": "*",
+		"ext-json": "*",
+		"ext-mbstring": "*",
+		"ext-openssl": "*",
+		"beyondcode/laravel-self-diagnosis": "^1.0.2",
+		"brick/math": "^0.8",
+		"buzz/laravel-h-captcha": "1.0.2",
+		"doctrine/dbal": "^2.7",
+		"fideloper/proxy": "^4.0",
+		"fruitcake/laravel-cors": "^2.0",
+		"intervention/image": "^2.4",
+		"jenssegers/agent": "^2.6",
+		"laravel/framework": "^8.0",
+		"laravel/helpers": "^1.1",
+		"laravel/horizon": "^5.0",
+		"laravel/passport": "^10.0",
+		"laravel/tinker": "^2.0",
+		"laravel/ui": "^2.0",
+		"league/flysystem-aws-s3-v3": "~1.0",
+		"league/flysystem-cached-adapter": "~1.0",
+		"league/iso3166": "^2.1",
+		"pbmedia/laravel-ffmpeg": "^7.0",
+		"phpseclib/phpseclib": "~2.0",
+		"bacon/bacon-qr-code": "^2.0.3",
+		"pixelfed/fractal": "^0.18.0",
+		"pragmarx/google2fa": "^8.0",
+		"pixelfed/laravel-snowflake": "^2.0",
+		"pixelfed/zttp": "^0.4",
+		"predis/predis": "^1.1",
+		"spatie/laravel-backup": "^6.0.0",
+		"spatie/laravel-image-optimizer": "^1.1",
+		"stevebauman/purify": "3.0.*",
+		"symfony/http-kernel": "5.1.5"
+	},
+	"require-dev": {
+		"brianium/paratest": "^6.1",
+		"facade/ignition": "^2.3.6",
+		"fzaninotto/faker": "^1.4",
+		"mockery/mockery": "^1.0",
+		"nunomaduro/collision": "^5.0",
+		"phpunit/phpunit": "^9.0"
+	},
+	"autoload": {
+		"classmap": [
+			"database/seeds",
+			"database/factories"
+		],
+		"psr-4": {
+			"App\\": "app/"
+		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"Tests\\": "tests/"
+		},
+		"files": [
+			"app/helpers.php"
+		]
+	},
+	"extra": {
+		"laravel": {
+			"dont-discover": [
+			]
+		}
+	},
+	"scripts": {
+		"post-root-package-install": [
+			"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+		],
+		"post-create-project-cmd": [
+			"@php artisan key:generate --ansi"
+		],
+		"post-autoload-dump": [
+			"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+			"@php artisan package:discover --ansi"
+		]
+	},
+	"config": {
+		"preferred-install": "dist",
+		"sort-packages": true,
+		"optimize-autoloader": true
+	},
+	"minimum-stability": "dev",
+	"prefer-stable": true
 }