Skip to content

request service should be removed before changing his definition#7

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

Merged
Jeckerson merged 3 commits into from
Apr 13, 2021
Merged

request service should be removed before changing his definition #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3181010
request server should be removed before changing his definitionn
Druid33 Jun 3, 2020
74e2e2e
phpcs error fixed
Druid33 Jun 3, 2020
749e20c
unit test for doRequst method
Druid33 Apr 13, 2021
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
15 changes: 9 additions & 6 deletions src/Codeception/Lib/Connector/Phalcon4.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,17 @@
namespace Codeception\Lib\Connector;

use Closure;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;
use Codeception\Util\Stub;
use Phalcon\Di;
use Phalcon\Http;
use RuntimeException;
use ReflectionProperty;
use Codeception\Util\Stub;
use Phalcon\Mvc\Application;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Phalcon\Mvc\Micro as MicroApplication;
use ReflectionProperty;
use RuntimeException;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\Response;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;

class Phalcon4 extends Client
{
Expand DownExpand Up@@ -110,6 +110,9 @@ public function doRequest($request)
Di::reset();
Di::setDefault($di);

if ($di->has('request')) {
$di->remove('request');
}
$di['request'] = Stub::construct($phRequest, [], ['getRawBody' => $request->getContent()]);

$response = $application->handle($pathString);
Expand Down
1 change: 1 addition & 0 deletions tests/_data/bootstrap-micro.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
<?php

$di = new \Phalcon\DI\FactoryDefault();
return new \Phalcon\Mvc\Micro($di);
1 change: 0 additions & 1 deletion tests/_support/AcceptanceTester.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
* Inherited Methods
* @method void wantToTest($text)
Expand Down
1 change: 0 additions & 1 deletion tests/_support/FunctionalTester.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
* Inherited Methods
* @method void wantToTest($text)
Expand Down
1 change: 0 additions & 1 deletion tests/_support/UnitTester.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
* Inherited Methods
* @method void wantToTest($text)
Expand Down
106 changes: 106 additions & 0 deletions tests/unit/Phalcon4ConnectorTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
<?php

declare(strict_types=1);

use Codeception\Lib\Connector\Phalcon4 as PhalconConnector;
use Codeception\Module\Phalcon4;
use Symfony\Component\BrowserKit\Request;

class Phalcon4ConnectorTest extends \Codeception\Test\Unit
{
protected function getPhalconModule(): Phalcon4
{
$container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
$module = new Phalcon4($container);
$module->_setConfig([
'bootstrap' => 'tests/_data/bootstrap.php',
'cleanup' => true,
'savepoints' => true,
'session' => 'Codeception\Lib\Connector\Phalcon4\MemorySession'
]);
$module->_initialize();
return $module;
}

public function testConstruct(): void
{
$connector = new PhalconConnector();
$this->assertInstanceOf(PhalconConnector::class, $connector);
}

public function testDoRequest(): void
{
$module = $this->getPhalconModule();
$test = new Codeception\Test\Unit();
$module->_before($test);

$connector = $module->client;

// parameters for Request object
$uri = '/';
$method = 'GET';
$params = [
'first' => 'one',
'second' => 'two'
];
$files = [
'file' => [
'name' => 'SomeFile.ext',
'tmp_name' => 'SomeFile.ext',
'error' => false
]
];
$cookies = [
'token' => 'asdev257'
];
$server = [
'HTTP_HOST' => 'localhost',
'SERVER_NAME' => 'my pc',
'SERVER_ADDR' => '127.0.0.1',
];
$content = "this is request content";

$request = new Request(
$uri,
$method,
$params,
$files,
$cookies,
$server,
$content
);

// send request
$response = $connector->doRequest($request);
$this->assertSame(200, $response->getStatusCode());

/** @var Phalcon\Http\Request $requestService*/
$requestService = $module->grabServiceFromContainer('request');

// assert request uri
$this->assertSame($uri, $requestService->getURI());

// assert request method
$this->assertSame($method, $requestService->getMethod());

// assert reques paramters
$this->assertSame($params['first'], $requestService->get('first'));
$this->assertSame($params['second'], $requestService->get('second'));

// assert uploaded file
$this->assertTrue($requestService->hasFiles());
/** @var Phalcon\Http\Request\File $uploadedFile */
$uploadedFile = $requestService->getUploadedFiles()[0];
$this->assertSame($files['file']['name'], $uploadedFile->getName());
$this->assertSame($files['file']['tmp_name'], $uploadedFile->getTempName());
$this->assertSame('ext', $uploadedFile->getExtension());

// assert server parameter
$this->assertSame($server['HTTP_HOST'], $requestService->getServer('HTTP_HOST'));

// assert request body
$this->assertSame($content, $requestService->getRawBody());

$module->_after($test);
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
request service should be removed before changing his definition by Druid33 · Pull Request #7 · Codeception/module-phalcon4 · GitHub
Skip to content
request service should be removed before changing his definition#7

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

 Merged

Jeckerson
merged 3 commits into

from

Apr 13, 2021
 Merged


request service should be removed before changing his definition
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3181010

request server should be removed before changing his definitionn


Druid33 Jun 3, 2020
74e2e2e

phpcs error fixed


Druid33 Jun 3, 2020
749e20c

unit test for doRequst method


Druid33 Apr 13, 2021

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


15 changes: 9 additions & 6 deletions
src/Codeception/Lib/Connector/Phalcon4.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,17 @@
namespace Codeception\Lib\Connector;

use Closure;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;
use Codeception\Util\Stub;
use Phalcon\Di;
use Phalcon\Http;
use RuntimeException;
use ReflectionProperty;
use Codeception\Util\Stub;
use Phalcon\Mvc\Application;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Phalcon\Mvc\Micro as MicroApplication;
use ReflectionProperty;
use RuntimeException;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\Response;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;

class Phalcon4 extends Client
{
Expand DownExpand Up@@ -110,6 +110,9 @@ public function doRequest($request)
 Di::reset();
 Di::setDefault($di);

 if ($di->has('request')) {
 $di->remove('request');
 }
 $di['request'] = Stub::construct($phRequest, [], ['getRawBody' => $request->getContent()]);

 $response = $application->handle($pathString);
Expand Down

1 change: 1 addition & 0 deletions
tests/_data/bootstrap-micro.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
<?php

$di = new \Phalcon\DI\FactoryDefault();
return new \Phalcon\Mvc\Micro($di);

1 change: 0 additions & 1 deletion
tests/_support/AcceptanceTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/FunctionalTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/UnitTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

106 changes: 106 additions & 0 deletions
tests/unit/Phalcon4ConnectorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
<?php

declare(strict_types=1);

use Codeception\Lib\Connector\Phalcon4 as PhalconConnector;
use Codeception\Module\Phalcon4;
use Symfony\Component\BrowserKit\Request;

class Phalcon4ConnectorTest extends \Codeception\Test\Unit
{
 protected function getPhalconModule(): Phalcon4
 {
 $container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
 $module = new Phalcon4($container);
 $module->_setConfig([
 'bootstrap' => 'tests/_data/bootstrap.php',
 'cleanup' => true,
 'savepoints' => true,
 'session' => 'Codeception\Lib\Connector\Phalcon4\MemorySession'
 ]);
 $module->_initialize();
 return $module;
 }

 public function testConstruct(): void
 {
 $connector = new PhalconConnector();
 $this->assertInstanceOf(PhalconConnector::class, $connector);
 }

 public function testDoRequest(): void
 {
 $module = $this->getPhalconModule();
 $test = new Codeception\Test\Unit();
 $module->_before($test);

 $connector = $module->client;

 // parameters for Request object
 $uri = '/';
 $method = 'GET';
 $params = [
 'first' => 'one',
 'second' => 'two'
 ];
 $files = [
 'file' => [
 'name' => 'SomeFile.ext',
 'tmp_name' => 'SomeFile.ext',
 'error' => false
 ]
 ];
 $cookies = [
 'token' => 'asdev257'
 ];
 $server = [
 'HTTP_HOST' => 'localhost',
 'SERVER_NAME' => 'my pc',
 'SERVER_ADDR' => '127.0.0.1',
 ];
 $content = "this is request content";

 $request = new Request(
 $uri,
 $method,
 $params,
 $files,
 $cookies,
 $server,
 $content
 );

 // send request
 $response = $connector->doRequest($request);
 $this->assertSame(200, $response->getStatusCode());

 /** @var Phalcon\Http\Request $requestService*/
 $requestService = $module->grabServiceFromContainer('request');

 // assert request uri
 $this->assertSame($uri, $requestService->getURI());

 // assert request method
 $this->assertSame($method, $requestService->getMethod());

 // assert reques paramters
 $this->assertSame($params['first'], $requestService->get('first'));
 $this->assertSame($params['second'], $requestService->get('second'));

 // assert uploaded file
 $this->assertTrue($requestService->hasFiles());
 /** @var Phalcon\Http\Request\File $uploadedFile */
 $uploadedFile = $requestService->getUploadedFiles()[0];
 $this->assertSame($files['file']['name'], $uploadedFile->getName());
 $this->assertSame($files['file']['tmp_name'], $uploadedFile->getTempName());
 $this->assertSame('ext', $uploadedFile->getExtension());

 // assert server parameter
 $this->assertSame($server['HTTP_HOST'], $requestService->getServer('HTTP_HOST'));

 // assert request body
 $this->assertSame($content, $requestService->getRawBody());

 $module->_after($test);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
request service should be removed before changing his definition by Druid33 · Pull Request #7 · Codeception/module-phalcon4 · GitHub
Skip to content
request service should be removed before changing his definition#7

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

 Merged

Jeckerson
merged 3 commits into

from

Apr 13, 2021
 Merged


request service should be removed before changing his definition
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3181010

request server should be removed before changing his definitionn


Druid33 Jun 3, 2020
74e2e2e

phpcs error fixed


Druid33 Jun 3, 2020
749e20c

unit test for doRequst method


Druid33 Apr 13, 2021

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


15 changes: 9 additions & 6 deletions
src/Codeception/Lib/Connector/Phalcon4.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,17 @@
namespace Codeception\Lib\Connector;

use Closure;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;
use Codeception\Util\Stub;
use Phalcon\Di;
use Phalcon\Http;
use RuntimeException;
use ReflectionProperty;
use Codeception\Util\Stub;
use Phalcon\Mvc\Application;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Phalcon\Mvc\Micro as MicroApplication;
use ReflectionProperty;
use RuntimeException;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\Response;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;

class Phalcon4 extends Client
{
Expand DownExpand Up@@ -110,6 +110,9 @@ public function doRequest($request)
 Di::reset();
 Di::setDefault($di);

 if ($di->has('request')) {
 $di->remove('request');
 }
 $di['request'] = Stub::construct($phRequest, [], ['getRawBody' => $request->getContent()]);

 $response = $application->handle($pathString);
Expand Down

1 change: 1 addition & 0 deletions
tests/_data/bootstrap-micro.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
<?php

$di = new \Phalcon\DI\FactoryDefault();
return new \Phalcon\Mvc\Micro($di);

1 change: 0 additions & 1 deletion
tests/_support/AcceptanceTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/FunctionalTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/UnitTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

106 changes: 106 additions & 0 deletions
tests/unit/Phalcon4ConnectorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
<?php

declare(strict_types=1);

use Codeception\Lib\Connector\Phalcon4 as PhalconConnector;
use Codeception\Module\Phalcon4;
use Symfony\Component\BrowserKit\Request;

class Phalcon4ConnectorTest extends \Codeception\Test\Unit
{
 protected function getPhalconModule(): Phalcon4
 {
 $container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
 $module = new Phalcon4($container);
 $module->_setConfig([
 'bootstrap' => 'tests/_data/bootstrap.php',
 'cleanup' => true,
 'savepoints' => true,
 'session' => 'Codeception\Lib\Connector\Phalcon4\MemorySession'
 ]);
 $module->_initialize();
 return $module;
 }

 public function testConstruct(): void
 {
 $connector = new PhalconConnector();
 $this->assertInstanceOf(PhalconConnector::class, $connector);
 }

 public function testDoRequest(): void
 {
 $module = $this->getPhalconModule();
 $test = new Codeception\Test\Unit();
 $module->_before($test);

 $connector = $module->client;

 // parameters for Request object
 $uri = '/';
 $method = 'GET';
 $params = [
 'first' => 'one',
 'second' => 'two'
 ];
 $files = [
 'file' => [
 'name' => 'SomeFile.ext',
 'tmp_name' => 'SomeFile.ext',
 'error' => false
 ]
 ];
 $cookies = [
 'token' => 'asdev257'
 ];
 $server = [
 'HTTP_HOST' => 'localhost',
 'SERVER_NAME' => 'my pc',
 'SERVER_ADDR' => '127.0.0.1',
 ];
 $content = "this is request content";

 $request = new Request(
 $uri,
 $method,
 $params,
 $files,
 $cookies,
 $server,
 $content
 );

 // send request
 $response = $connector->doRequest($request);
 $this->assertSame(200, $response->getStatusCode());

 /** @var Phalcon\Http\Request $requestService*/
 $requestService = $module->grabServiceFromContainer('request');

 // assert request uri
 $this->assertSame($uri, $requestService->getURI());

 // assert request method
 $this->assertSame($method, $requestService->getMethod());

 // assert reques paramters
 $this->assertSame($params['first'], $requestService->get('first'));
 $this->assertSame($params['second'], $requestService->get('second'));

 // assert uploaded file
 $this->assertTrue($requestService->hasFiles());
 /** @var Phalcon\Http\Request\File $uploadedFile */
 $uploadedFile = $requestService->getUploadedFiles()[0];
 $this->assertSame($files['file']['name'], $uploadedFile->getName());
 $this->assertSame($files['file']['tmp_name'], $uploadedFile->getTempName());
 $this->assertSame('ext', $uploadedFile->getExtension());

 // assert server parameter
 $this->assertSame($server['HTTP_HOST'], $requestService->getServer('HTTP_HOST'));

 // assert request body
 $this->assertSame($content, $requestService->getRawBody());

 $module->_after($test);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
request service should be removed before changing his definition by Druid33 · Pull Request #7 · Codeception/module-phalcon4 · GitHub
Skip to content
request service should be removed before changing his definition#7

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

 Merged

Jeckerson
merged 3 commits into

from

Apr 13, 2021
 Merged


request service should be removed before changing his definition
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3181010

request server should be removed before changing his definitionn


Druid33 Jun 3, 2020
74e2e2e

phpcs error fixed


Druid33 Jun 3, 2020
749e20c

unit test for doRequst method


Druid33 Apr 13, 2021

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


15 changes: 9 additions & 6 deletions
src/Codeception/Lib/Connector/Phalcon4.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,17 @@
namespace Codeception\Lib\Connector;

use Closure;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;
use Codeception\Util\Stub;
use Phalcon\Di;
use Phalcon\Http;
use RuntimeException;
use ReflectionProperty;
use Codeception\Util\Stub;
use Phalcon\Mvc\Application;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Phalcon\Mvc\Micro as MicroApplication;
use ReflectionProperty;
use RuntimeException;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\Response;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;

class Phalcon4 extends Client
{
Expand DownExpand Up@@ -110,6 +110,9 @@ public function doRequest($request)
 Di::reset();
 Di::setDefault($di);

 if ($di->has('request')) {
 $di->remove('request');
 }
 $di['request'] = Stub::construct($phRequest, [], ['getRawBody' => $request->getContent()]);

 $response = $application->handle($pathString);
Expand Down

1 change: 1 addition & 0 deletions
tests/_data/bootstrap-micro.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
<?php

$di = new \Phalcon\DI\FactoryDefault();
return new \Phalcon\Mvc\Micro($di);

1 change: 0 additions & 1 deletion
tests/_support/AcceptanceTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/FunctionalTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/UnitTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

106 changes: 106 additions & 0 deletions
tests/unit/Phalcon4ConnectorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
<?php

declare(strict_types=1);

use Codeception\Lib\Connector\Phalcon4 as PhalconConnector;
use Codeception\Module\Phalcon4;
use Symfony\Component\BrowserKit\Request;

class Phalcon4ConnectorTest extends \Codeception\Test\Unit
{
 protected function getPhalconModule(): Phalcon4
 {
 $container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
 $module = new Phalcon4($container);
 $module->_setConfig([
 'bootstrap' => 'tests/_data/bootstrap.php',
 'cleanup' => true,
 'savepoints' => true,
 'session' => 'Codeception\Lib\Connector\Phalcon4\MemorySession'
 ]);
 $module->_initialize();
 return $module;
 }

 public function testConstruct(): void
 {
 $connector = new PhalconConnector();
 $this->assertInstanceOf(PhalconConnector::class, $connector);
 }

 public function testDoRequest(): void
 {
 $module = $this->getPhalconModule();
 $test = new Codeception\Test\Unit();
 $module->_before($test);

 $connector = $module->client;

 // parameters for Request object
 $uri = '/';
 $method = 'GET';
 $params = [
 'first' => 'one',
 'second' => 'two'
 ];
 $files = [
 'file' => [
 'name' => 'SomeFile.ext',
 'tmp_name' => 'SomeFile.ext',
 'error' => false
 ]
 ];
 $cookies = [
 'token' => 'asdev257'
 ];
 $server = [
 'HTTP_HOST' => 'localhost',
 'SERVER_NAME' => 'my pc',
 'SERVER_ADDR' => '127.0.0.1',
 ];
 $content = "this is request content";

 $request = new Request(
 $uri,
 $method,
 $params,
 $files,
 $cookies,
 $server,
 $content
 );

 // send request
 $response = $connector->doRequest($request);
 $this->assertSame(200, $response->getStatusCode());

 /** @var Phalcon\Http\Request $requestService*/
 $requestService = $module->grabServiceFromContainer('request');

 // assert request uri
 $this->assertSame($uri, $requestService->getURI());

 // assert request method
 $this->assertSame($method, $requestService->getMethod());

 // assert reques paramters
 $this->assertSame($params['first'], $requestService->get('first'));
 $this->assertSame($params['second'], $requestService->get('second'));

 // assert uploaded file
 $this->assertTrue($requestService->hasFiles());
 /** @var Phalcon\Http\Request\File $uploadedFile */
 $uploadedFile = $requestService->getUploadedFiles()[0];
 $this->assertSame($files['file']['name'], $uploadedFile->getName());
 $this->assertSame($files['file']['tmp_name'], $uploadedFile->getTempName());
 $this->assertSame('ext', $uploadedFile->getExtension());

 // assert server parameter
 $this->assertSame($server['HTTP_HOST'], $requestService->getServer('HTTP_HOST'));

 // assert request body
 $this->assertSame($content, $requestService->getRawBody());

 $module->_after($test);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
request service should be removed before changing his definition by Druid33 · Pull Request #7 · Codeception/module-phalcon4 · GitHub
Skip to content
request service should be removed before changing his definition#7

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

 Merged

Jeckerson
merged 3 commits into

from

Apr 13, 2021
 Merged


request service should be removed before changing his definition
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3181010

request server should be removed before changing his definitionn


Druid33 Jun 3, 2020
74e2e2e

phpcs error fixed


Druid33 Jun 3, 2020
749e20c

unit test for doRequst method


Druid33 Apr 13, 2021

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


15 changes: 9 additions & 6 deletions
src/Codeception/Lib/Connector/Phalcon4.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,17 @@
namespace Codeception\Lib\Connector;

use Closure;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;
use Codeception\Util\Stub;
use Phalcon\Di;
use Phalcon\Http;
use RuntimeException;
use ReflectionProperty;
use Codeception\Util\Stub;
use Phalcon\Mvc\Application;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Phalcon\Mvc\Micro as MicroApplication;
use ReflectionProperty;
use RuntimeException;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\Response;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;

class Phalcon4 extends Client
{
Expand DownExpand Up@@ -110,6 +110,9 @@ public function doRequest($request)
 Di::reset();
 Di::setDefault($di);

 if ($di->has('request')) {
 $di->remove('request');
 }
 $di['request'] = Stub::construct($phRequest, [], ['getRawBody' => $request->getContent()]);

 $response = $application->handle($pathString);
Expand Down

1 change: 1 addition & 0 deletions
tests/_data/bootstrap-micro.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
<?php

$di = new \Phalcon\DI\FactoryDefault();
return new \Phalcon\Mvc\Micro($di);

1 change: 0 additions & 1 deletion
tests/_support/AcceptanceTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/FunctionalTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/UnitTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

106 changes: 106 additions & 0 deletions
tests/unit/Phalcon4ConnectorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
<?php

declare(strict_types=1);

use Codeception\Lib\Connector\Phalcon4 as PhalconConnector;
use Codeception\Module\Phalcon4;
use Symfony\Component\BrowserKit\Request;

class Phalcon4ConnectorTest extends \Codeception\Test\Unit
{
 protected function getPhalconModule(): Phalcon4
 {
 $container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
 $module = new Phalcon4($container);
 $module->_setConfig([
 'bootstrap' => 'tests/_data/bootstrap.php',
 'cleanup' => true,
 'savepoints' => true,
 'session' => 'Codeception\Lib\Connector\Phalcon4\MemorySession'
 ]);
 $module->_initialize();
 return $module;
 }

 public function testConstruct(): void
 {
 $connector = new PhalconConnector();
 $this->assertInstanceOf(PhalconConnector::class, $connector);
 }

 public function testDoRequest(): void
 {
 $module = $this->getPhalconModule();
 $test = new Codeception\Test\Unit();
 $module->_before($test);

 $connector = $module->client;

 // parameters for Request object
 $uri = '/';
 $method = 'GET';
 $params = [
 'first' => 'one',
 'second' => 'two'
 ];
 $files = [
 'file' => [
 'name' => 'SomeFile.ext',
 'tmp_name' => 'SomeFile.ext',
 'error' => false
 ]
 ];
 $cookies = [
 'token' => 'asdev257'
 ];
 $server = [
 'HTTP_HOST' => 'localhost',
 'SERVER_NAME' => 'my pc',
 'SERVER_ADDR' => '127.0.0.1',
 ];
 $content = "this is request content";

 $request = new Request(
 $uri,
 $method,
 $params,
 $files,
 $cookies,
 $server,
 $content
 );

 // send request
 $response = $connector->doRequest($request);
 $this->assertSame(200, $response->getStatusCode());

 /** @var Phalcon\Http\Request $requestService*/
 $requestService = $module->grabServiceFromContainer('request');

 // assert request uri
 $this->assertSame($uri, $requestService->getURI());

 // assert request method
 $this->assertSame($method, $requestService->getMethod());

 // assert reques paramters
 $this->assertSame($params['first'], $requestService->get('first'));
 $this->assertSame($params['second'], $requestService->get('second'));

 // assert uploaded file
 $this->assertTrue($requestService->hasFiles());
 /** @var Phalcon\Http\Request\File $uploadedFile */
 $uploadedFile = $requestService->getUploadedFiles()[0];
 $this->assertSame($files['file']['name'], $uploadedFile->getName());
 $this->assertSame($files['file']['tmp_name'], $uploadedFile->getTempName());
 $this->assertSame('ext', $uploadedFile->getExtension());

 // assert server parameter
 $this->assertSame($server['HTTP_HOST'], $requestService->getServer('HTTP_HOST'));

 // assert request body
 $this->assertSame($content, $requestService->getRawBody());

 $module->_after($test);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
request service should be removed before changing his definition by Druid33 · Pull Request #7 · Codeception/module-phalcon4 · GitHub
Skip to content
request service should be removed before changing his definition#7

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

 Merged

Jeckerson
merged 3 commits into

from

Apr 13, 2021
 Merged


request service should be removed before changing his definition
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3181010

request server should be removed before changing his definitionn


Druid33 Jun 3, 2020
74e2e2e

phpcs error fixed


Druid33 Jun 3, 2020
749e20c

unit test for doRequst method


Druid33 Apr 13, 2021

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


15 changes: 9 additions & 6 deletions
src/Codeception/Lib/Connector/Phalcon4.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,17 @@
namespace Codeception\Lib\Connector;

use Closure;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;
use Codeception\Util\Stub;
use Phalcon\Di;
use Phalcon\Http;
use RuntimeException;
use ReflectionProperty;
use Codeception\Util\Stub;
use Phalcon\Mvc\Application;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Phalcon\Mvc\Micro as MicroApplication;
use ReflectionProperty;
use RuntimeException;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\Response;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;

class Phalcon4 extends Client
{
Expand DownExpand Up@@ -110,6 +110,9 @@ public function doRequest($request)
 Di::reset();
 Di::setDefault($di);

 if ($di->has('request')) {
 $di->remove('request');
 }
 $di['request'] = Stub::construct($phRequest, [], ['getRawBody' => $request->getContent()]);

 $response = $application->handle($pathString);
Expand Down

1 change: 1 addition & 0 deletions
tests/_data/bootstrap-micro.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
<?php

$di = new \Phalcon\DI\FactoryDefault();
return new \Phalcon\Mvc\Micro($di);

1 change: 0 additions & 1 deletion
tests/_support/AcceptanceTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/FunctionalTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/UnitTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

106 changes: 106 additions & 0 deletions
tests/unit/Phalcon4ConnectorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
<?php

declare(strict_types=1);

use Codeception\Lib\Connector\Phalcon4 as PhalconConnector;
use Codeception\Module\Phalcon4;
use Symfony\Component\BrowserKit\Request;

class Phalcon4ConnectorTest extends \Codeception\Test\Unit
{
 protected function getPhalconModule(): Phalcon4
 {
 $container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
 $module = new Phalcon4($container);
 $module->_setConfig([
 'bootstrap' => 'tests/_data/bootstrap.php',
 'cleanup' => true,
 'savepoints' => true,
 'session' => 'Codeception\Lib\Connector\Phalcon4\MemorySession'
 ]);
 $module->_initialize();
 return $module;
 }

 public function testConstruct(): void
 {
 $connector = new PhalconConnector();
 $this->assertInstanceOf(PhalconConnector::class, $connector);
 }

 public function testDoRequest(): void
 {
 $module = $this->getPhalconModule();
 $test = new Codeception\Test\Unit();
 $module->_before($test);

 $connector = $module->client;

 // parameters for Request object
 $uri = '/';
 $method = 'GET';
 $params = [
 'first' => 'one',
 'second' => 'two'
 ];
 $files = [
 'file' => [
 'name' => 'SomeFile.ext',
 'tmp_name' => 'SomeFile.ext',
 'error' => false
 ]
 ];
 $cookies = [
 'token' => 'asdev257'
 ];
 $server = [
 'HTTP_HOST' => 'localhost',
 'SERVER_NAME' => 'my pc',
 'SERVER_ADDR' => '127.0.0.1',
 ];
 $content = "this is request content";

 $request = new Request(
 $uri,
 $method,
 $params,
 $files,
 $cookies,
 $server,
 $content
 );

 // send request
 $response = $connector->doRequest($request);
 $this->assertSame(200, $response->getStatusCode());

 /** @var Phalcon\Http\Request $requestService*/
 $requestService = $module->grabServiceFromContainer('request');

 // assert request uri
 $this->assertSame($uri, $requestService->getURI());

 // assert request method
 $this->assertSame($method, $requestService->getMethod());

 // assert reques paramters
 $this->assertSame($params['first'], $requestService->get('first'));
 $this->assertSame($params['second'], $requestService->get('second'));

 // assert uploaded file
 $this->assertTrue($requestService->hasFiles());
 /** @var Phalcon\Http\Request\File $uploadedFile */
 $uploadedFile = $requestService->getUploadedFiles()[0];
 $this->assertSame($files['file']['name'], $uploadedFile->getName());
 $this->assertSame($files['file']['tmp_name'], $uploadedFile->getTempName());
 $this->assertSame('ext', $uploadedFile->getExtension());

 // assert server parameter
 $this->assertSame($server['HTTP_HOST'], $requestService->getServer('HTTP_HOST'));

 // assert request body
 $this->assertSame($content, $requestService->getRawBody());

 $module->_after($test);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
request service should be removed before changing his definition by Druid33 · Pull Request #7 · Codeception/module-phalcon4 · GitHub
Skip to content
request service should be removed before changing his definition#7

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

 Merged

Jeckerson
merged 3 commits into

from

Apr 13, 2021
 Merged


request service should be removed before changing his definition
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3181010

request server should be removed before changing his definitionn


Druid33 Jun 3, 2020
74e2e2e

phpcs error fixed


Druid33 Jun 3, 2020
749e20c

unit test for doRequst method


Druid33 Apr 13, 2021

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


15 changes: 9 additions & 6 deletions
src/Codeception/Lib/Connector/Phalcon4.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,17 @@
namespace Codeception\Lib\Connector;

use Closure;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;
use Codeception\Util\Stub;
use Phalcon\Di;
use Phalcon\Http;
use RuntimeException;
use ReflectionProperty;
use Codeception\Util\Stub;
use Phalcon\Mvc\Application;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Phalcon\Mvc\Micro as MicroApplication;
use ReflectionProperty;
use RuntimeException;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\Response;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;

class Phalcon4 extends Client
{
Expand DownExpand Up@@ -110,6 +110,9 @@ public function doRequest($request)
 Di::reset();
 Di::setDefault($di);

 if ($di->has('request')) {
 $di->remove('request');
 }
 $di['request'] = Stub::construct($phRequest, [], ['getRawBody' => $request->getContent()]);

 $response = $application->handle($pathString);
Expand Down

1 change: 1 addition & 0 deletions
tests/_data/bootstrap-micro.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
<?php

$di = new \Phalcon\DI\FactoryDefault();
return new \Phalcon\Mvc\Micro($di);

1 change: 0 additions & 1 deletion
tests/_support/AcceptanceTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/FunctionalTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/UnitTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

106 changes: 106 additions & 0 deletions
tests/unit/Phalcon4ConnectorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
<?php

declare(strict_types=1);

use Codeception\Lib\Connector\Phalcon4 as PhalconConnector;
use Codeception\Module\Phalcon4;
use Symfony\Component\BrowserKit\Request;

class Phalcon4ConnectorTest extends \Codeception\Test\Unit
{
 protected function getPhalconModule(): Phalcon4
 {
 $container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
 $module = new Phalcon4($container);
 $module->_setConfig([
 'bootstrap' => 'tests/_data/bootstrap.php',
 'cleanup' => true,
 'savepoints' => true,
 'session' => 'Codeception\Lib\Connector\Phalcon4\MemorySession'
 ]);
 $module->_initialize();
 return $module;
 }

 public function testConstruct(): void
 {
 $connector = new PhalconConnector();
 $this->assertInstanceOf(PhalconConnector::class, $connector);
 }

 public function testDoRequest(): void
 {
 $module = $this->getPhalconModule();
 $test = new Codeception\Test\Unit();
 $module->_before($test);

 $connector = $module->client;

 // parameters for Request object
 $uri = '/';
 $method = 'GET';
 $params = [
 'first' => 'one',
 'second' => 'two'
 ];
 $files = [
 'file' => [
 'name' => 'SomeFile.ext',
 'tmp_name' => 'SomeFile.ext',
 'error' => false
 ]
 ];
 $cookies = [
 'token' => 'asdev257'
 ];
 $server = [
 'HTTP_HOST' => 'localhost',
 'SERVER_NAME' => 'my pc',
 'SERVER_ADDR' => '127.0.0.1',
 ];
 $content = "this is request content";

 $request = new Request(
 $uri,
 $method,
 $params,
 $files,
 $cookies,
 $server,
 $content
 );

 // send request
 $response = $connector->doRequest($request);
 $this->assertSame(200, $response->getStatusCode());

 /** @var Phalcon\Http\Request $requestService*/
 $requestService = $module->grabServiceFromContainer('request');

 // assert request uri
 $this->assertSame($uri, $requestService->getURI());

 // assert request method
 $this->assertSame($method, $requestService->getMethod());

 // assert reques paramters
 $this->assertSame($params['first'], $requestService->get('first'));
 $this->assertSame($params['second'], $requestService->get('second'));

 // assert uploaded file
 $this->assertTrue($requestService->hasFiles());
 /** @var Phalcon\Http\Request\File $uploadedFile */
 $uploadedFile = $requestService->getUploadedFiles()[0];
 $this->assertSame($files['file']['name'], $uploadedFile->getName());
 $this->assertSame($files['file']['tmp_name'], $uploadedFile->getTempName());
 $this->assertSame('ext', $uploadedFile->getExtension());

 // assert server parameter
 $this->assertSame($server['HTTP_HOST'], $requestService->getServer('HTTP_HOST'));

 // assert request body
 $this->assertSame($content, $requestService->getRawBody());

 $module->_after($test);
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
request service should be removed before changing his definition by Druid33 · Pull Request #7 · Codeception/module-phalcon4 · GitHub
Skip to content
request service should be removed before changing his definition#7

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

 Merged

Jeckerson
merged 3 commits into

from

Apr 13, 2021
 Merged


request service should be removed before changing his definition
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3181010

request server should be removed before changing his definitionn


Druid33 Jun 3, 2020
74e2e2e

phpcs error fixed


Druid33 Jun 3, 2020
749e20c

unit test for doRequst method


Druid33 Apr 13, 2021

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


15 changes: 9 additions & 6 deletions
src/Codeception/Lib/Connector/Phalcon4.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,17 @@
namespace Codeception\Lib\Connector;

use Closure;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;
use Codeception\Util\Stub;
use Phalcon\Di;
use Phalcon\Http;
use RuntimeException;
use ReflectionProperty;
use Codeception\Util\Stub;
use Phalcon\Mvc\Application;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Phalcon\Mvc\Micro as MicroApplication;
use ReflectionProperty;
use RuntimeException;
use Symfony\Component\BrowserKit\AbstractBrowser as Client;
use Symfony\Component\BrowserKit\Cookie;
use Symfony\Component\BrowserKit\Response;
use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;

class Phalcon4 extends Client
{
Expand DownExpand Up@@ -110,6 +110,9 @@ public function doRequest($request)
 Di::reset();
 Di::setDefault($di);

 if ($di->has('request')) {
 $di->remove('request');
 }
 $di['request'] = Stub::construct($phRequest, [], ['getRawBody' => $request->getContent()]);

 $response = $application->handle($pathString);
Expand Down

1 change: 1 addition & 0 deletions
tests/_data/bootstrap-micro.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
<?php

$di = new \Phalcon\DI\FactoryDefault();
return new \Phalcon\Mvc\Micro($di);

1 change: 0 additions & 1 deletion
tests/_support/AcceptanceTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/FunctionalTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

1 change: 0 additions & 1 deletion
tests/_support/UnitTester.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
<?php


/**
 * Inherited Methods
 * @method void wantToTest($text)
Expand Down

106 changes: 106 additions & 0 deletions
tests/unit/Phalcon4ConnectorTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
<?php

declare(strict_types=1);

use Codeception\Lib\Connector\Phalcon4 as PhalconConnector;
use Codeception\Module\Phalcon4;
use Symfony\Component\BrowserKit\Request;

class Phalcon4ConnectorTest extends \Codeception\Test\Unit
{
 protected function getPhalconModule(): Phalcon4
 {
 $container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
 $module = new Phalcon4($container);
 $module->_setConfig([
 'bootstrap' => 'tests/_data/bootstrap.php',
 'cleanup' => true,
 'savepoints' => true,
 'session' => 'Codeception\Lib\Connector\Phalcon4\MemorySession'
 ]);
 $module->_initialize();
 return $module;
 }

 public function testConstruct(): void
 {
 $connector = new PhalconConnector();
 $this->assertInstanceOf(PhalconConnector::class, $connector);
 }

 public function testDoRequest(): void
 {
 $module = $this->getPhalconModule();
 $test = new Codeception\Test\Unit();
 $module->_before($test);

 $connector = $module->client;

 // parameters for Request object
 $uri = '/';
 $method = 'GET';
 $params = [
 'first' => 'one',
 'second' => 'two'
 ];
 $files = [
 'file' => [
 'name' => 'SomeFile.ext',
 'tmp_name' => 'SomeFile.ext',
 'error' => false
 ]
 ];
 $cookies = [
 'token' => 'asdev257'
 ];
 $server = [
 'HTTP_HOST' => 'localhost',
 'SERVER_NAME' => 'my pc',
 'SERVER_ADDR' => '127.0.0.1',
 ];
 $content = "this is request content";

 $request = new Request(
 $uri,
 $method,
 $params,
 $files,
 $cookies,
 $server,
 $content
 );

 // send request
 $response = $connector->doRequest($request);
 $this->assertSame(200, $response->getStatusCode());

 /** @var Phalcon\Http\Request $requestService*/
 $requestService = $module->grabServiceFromContainer('request');

 // assert request uri
 $this->assertSame($uri, $requestService->getURI());

 // assert request method
 $this->assertSame($method, $requestService->getMethod());

 // assert reques paramters
 $this->assertSame($params['first'], $requestService->get('first'));
 $this->assertSame($params['second'], $requestService->get('second'));

 // assert uploaded file
 $this->assertTrue($requestService->hasFiles());
 /** @var Phalcon\Http\Request\File $uploadedFile */
 $uploadedFile = $requestService->getUploadedFiles()[0];
 $this->assertSame($files['file']['name'], $uploadedFile->getName());
 $this->assertSame($files['file']['tmp_name'], $uploadedFile->getTempName());
 $this->assertSame('ext', $uploadedFile->getExtension());

 // assert server parameter
 $this->assertSame($server['HTTP_HOST'], $requestService->getServer('HTTP_HOST'));

 // assert request body
 $this->assertSame($content, $requestService->getRawBody());

 $module->_after($test);
 }
}