<?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
// this is in the same namespace as Install for mocking 'function_exists'
namespace Friendica\Core;
use Friendica\Core\Config\Cache;
use Friendica\DI;
use Friendica\Network\CurlResult;
+use Friendica\Network\IHTTPRequest;
use Friendica\Test\MockedTest;
use Friendica\Test\Util\VFSTrait;
-use Friendica\Util\Network;
use Mockery\MockInterface;
class InstallerTest extends MockedTest
* @var \Friendica\Core\L10n|MockInterface
*/
private $l10nMock;
+ /**
+ * @var Dice|MockInterface
+ */
+ private $dice;
public function setUp()
{
$this->l10nMock = \Mockery::mock(\Friendica\Core\L10n::class);
/** @var Dice|MockInterface $dice */
- $dice = \Mockery::mock(Dice::class)->makePartial();
- $dice = $dice->addRules(include __DIR__ . '/../../../static/dependencies.config.php');
+ $this->dice = \Mockery::mock(Dice::class)->makePartial();
+ $this->dice = $this->dice->addRules(include __DIR__ . '/../../../static/dependencies.config.php');
- $dice->shouldReceive('create')
+ $this->dice->shouldReceive('create')
->with(\Friendica\Core\L10n::class)
->andReturn($this->l10nMock);
- DI::init($dice);
+ DI::init($this->dice);
}
private function mockL10nT(string $text, $times = null)
->andReturn('test Error');
// Mocking the CURL Request
- $networkMock = \Mockery::mock('alias:' . Network::class);
+ $networkMock = \Mockery::mock(IHTTPRequest::class);
$networkMock
- ->shouldReceive('fetchUrlFull')
+ ->shouldReceive('fetchFull')
->with('https://test/install/testrewrite')
->andReturn($curlResult);
$networkMock
- ->shouldReceive('fetchUrlFull')
+ ->shouldReceive('fetchFull')
->with('http://test/install/testrewrite')
->andReturn($curlResult);
+ $this->dice->shouldReceive('create')
+ ->with(IHTTPRequest::class)
+ ->andReturn($networkMock);
+
+ DI::init($this->dice);
+
// Mocking that we can use CURL
$this->setFunctions(['curl_init' => true]);
->andReturn('204');
// Mocking the CURL Request
- $networkMock = \Mockery::mock('alias:' . Network::class);
+ $networkMock = \Mockery::mock(IHTTPRequest::class);
$networkMock
- ->shouldReceive('fetchUrlFull')
+ ->shouldReceive('fetchFull')
->with('https://test/install/testrewrite')
->andReturn($curlResultF);
$networkMock
- ->shouldReceive('fetchUrlFull')
+ ->shouldReceive('fetchFull')
->with('http://test/install/testrewrite')
->andReturn($curlResultW);
+ $this->dice->shouldReceive('create')
+ ->with(IHTTPRequest::class)
+ ->andReturn($networkMock);
+
+ DI::init($this->dice);
+
// Mocking that we can use CURL
$this->setFunctions(['curl_init' => true]);