Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix magento2 driver #1420

Merged
merged 1 commit into from
Sep 28, 2023
Merged

Fix magento2 driver #1420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 13 additions & 105 deletions cli/Valet/Drivers/Specific/Magento2ValetDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,137 +7,45 @@
class Magento2ValetDriver extends ValetDriver
{
/**
* Holds the MAGE_MODE from app/etc/config.php or $ENV.
*
* Can't be correctly typed yet because PHP 7.3.
*
* @param string|null
*/
private $mageMode = null;

/**
* Determine if the driver serves the request.
* @inheritdoc
*/
public function serves(string $sitePath, string $siteName, string $uri): bool
{
return file_exists($sitePath.'/bin/magento') && file_exists($sitePath.'/pub/index.php');
}

/**
* Determine if the incoming request is for a static file.
* @inheritdoc
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri)/*: string|false */
{
$this->checkMageMode($sitePath);

$uri = $this->handleForVersions($uri);
$route = parse_url(substr($uri, 1))['path'];

$pub = '';
if ($this->mageMode === 'developer') {
$pub = 'pub/';
}

if (! $this->isPubDirectory($sitePath, $route, $pub)) {
return false;
}

$magentoPackagePubDir = $sitePath;
if ($this->mageMode !== 'developer') {
$magentoPackagePubDir .= '/pub';
}

$file = $magentoPackagePubDir.'/'.$route;
$uri = preg_replace('/^\/static(\/version[\d]+)/', '/static', $uri);

if (file_exists($file)) {
return $magentoPackagePubDir.$uri;
if (file_exists($staticFilePath = $sitePath . '/pub' . $uri)) {
return $staticFilePath;
}

if (strpos($route, $pub.'static/') === 0) {
$route = preg_replace('#'.$pub.'static/#', '', $route, 1);
$_GET['resource'] = $route;
include $magentoPackagePubDir.'/'.$pub.'static.php';
if (strpos($uri, '/static/') === 0) {
$_GET['resource'] = preg_replace('#static/#', '', $uri, 1);
include($sitePath . '/pub/static.php');
exit;
}

if (strpos($route, $pub.'media/') === 0) {
include $magentoPackagePubDir.'/'.$pub.'get.php';
if (strpos($uri, '/media/') === 0) {
include($sitePath . '/pub/get.php');
exit;
}

return false;
}

/**
* Rewrite URLs that look like "versions12345/" to remove
* the versions12345/ part.
*/
private function handleForVersions($route): string
{
return preg_replace('/version\d*\//', '', $route);
}

/**
* Determine the current MAGE_MODE.
*/
private function checkMageMode($sitePath): void
{
if ($this->mageMode !== null) {
// We have already figure out mode, no need to check it again
return;
}

if (! file_exists($sitePath.'/index.php')) {
$this->mageMode = 'production'; // Can't use developer mode without index.php in project root

return;
}

$mageConfig = [];

if (file_exists($sitePath.'/app/etc/env.php')) {
$mageConfig = require $sitePath.'/app/etc/env.php';
}

if (array_key_exists('MAGE_MODE', $mageConfig)) {
$this->mageMode = $mageConfig['MAGE_MODE'];
}
}

/**
* Checks to see if route is referencing any directory inside pub. This is a dynamic check so that if any new
* directories are added to pub this driver will not need to be updated.
*/
private function isPubDirectory($sitePath, $route, $pub = ''): bool
{
$sitePath .= '/pub/';
$dirs = glob($sitePath.'*', GLOB_ONLYDIR);

$dirs = str_replace($sitePath, '', $dirs);

foreach ($dirs as $dir) {
if (strpos($route, $pub.$dir.'/') === 0) {
return true;
}
}

return false;
}

/**
* Get the fully resolved path to the application's front controller.
* @inheritdoc
*/
public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string
{
$this->checkMageMode($sitePath);

if ($this->mageMode === 'developer') {
$_SERVER['DOCUMENT_ROOT'] = $sitePath;

return $sitePath.'/index.php';
}

$_SERVER['DOCUMENT_ROOT'] = $sitePath.'/pub';
$_SERVER['SERVER_NAME'] = $_SERVER['HTTP_HOST'];
$_SERVER['DOCUMENT_ROOT'] = $sitePath;

return $sitePath.'/pub/index.php';
}
Expand Down