From 2e0664dad47604d4198313864a95fa4adbbbab1d Mon Sep 17 00:00:00 2001
From: Nick Liu <deltik@gmx.com>
Date: Mon, 11 May 2020 15:34:16 -0500
Subject: [PATCH] Moved placeholder core_image.phar to e107_system

Also made naming of "core_image.phar" consistent everywhere
---
 .codeclimate.yml                                    |   2 +-
 .github/workflows/build-release/e107_make.php       |   8 ++++----
 .../core_image.php => e107_system/core_image.phar   | Bin
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename e107_admin/core_image.php => e107_system/core_image.phar (100%)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 6c2241653..49b2fd133 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -49,7 +49,6 @@ exclude_patterns:
 - "**/tests/"
 - "**/vendor/"
 - "**/*.d.ts"
-- "e107_admin/core_image.php"
 - "e107_plugins/log/js/awesomechart.js"
 - "e107_core/**/*.sc"
 - "e107_docs/**/*"
@@ -59,6 +58,7 @@ exclude_patterns:
 - "e107_handlers/phpmailer/**/*"
 - "e107_handlers/phpthumb/**/*"
 - "e107_handlers/xmlrpc/**/*"
+- "e107_system/core_image.phar"
 - "e107_web/**/*"
 - "e107_tests/tests/**/*"
 # Ignore symlinks that are allowed to be broken due to local configurations
diff --git a/.github/workflows/build-release/e107_make.php b/.github/workflows/build-release/e107_make.php
index 30f1c3866..2a0abef5c 100644
--- a/.github/workflows/build-release/e107_make.php
+++ b/.github/workflows/build-release/e107_make.php
@@ -276,7 +276,7 @@ class e107Build
 
 			$releaseDir = "{$this->config['baseDir']}/target/{$this->config['main']['name']}/release/" . $this->releaseDir;
 
-            $this->copyCoreImage($releaseDir . "/core_image.php");
+            $this->copyCoreImage($releaseDir . "/core_image.phar");
 
 			/**
 			 * git archive -o update.zip HEAD $(git diff --name-only [id])
@@ -483,9 +483,9 @@ class e107Build
 		//create new image file - writes directly to cvsroot
 		$this->changeDir($this->config['baseDir']);
 
-		$imageFile = $this->tempDir . "core_image.php";
+		$imageFile = $this->tempDir . "core_image.phar";
 
-		$this->status("Creating new core_image.php file ({$imageFile})", true);
+		$this->status("Creating new core_image.phar file ({$imageFile})", true);
 		new JsonPharCoreImage($this->exportDir, $this->tempDir, $this->version, $imageFile);
 
 		$dir = "{$this->config['baseDir']}/target/{$this->config['main']['name']}/export";
@@ -494,7 +494,7 @@ class e107Build
 
 	private function copyCoreImage($destination)
 	{
-		$source = $this->tempDir . "core_image.php";
+		$source = $this->tempDir . "core_image.phar";
 
 		if (!file_exists($source))
 		{
diff --git a/e107_admin/core_image.php b/e107_system/core_image.phar
similarity index 100%
rename from e107_admin/core_image.php
rename to e107_system/core_image.phar