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.

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

Jump to bottom

Fixed missing Interface imports #14249

Merged
merged 11 commits into from Jul 17, 2019
Merged

Fixed missing Interface imports #14249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9802736
Added DialectInterface to the header
Jul 17, 2019
6d9b32a
Added DialectInterface also to AdapterInterface
Jul 17, 2019
ed585d5
Modified changelog
Jul 17, 2019
e2aaf26
ResultInterface was also missing
Jul 17, 2019
208003e
Changelog updated
Jul 17, 2019
555c340
AdapterInterface was missing from Db\Result\Pdo
Jul 17, 2019
02e44b0
Changelog update
Jul 17, 2019
8836f8d
Missing Mcv\Model\ResultsetInterface in Html\Tag
Jul 17, 2019
600bbd1
Changelog update
Jul 17, 2019
0f32ed0
Typo in some imports
Jul 17, 2019
6c2957a
Changelog update
Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG-4.0.md
View file
Open in desktop
@@ -1,5 +1,8 @@
# [4.0.0-beta.2](https://github.com/phalcon/cphalcon/releases/tag/v4.0.0-beta.2) (xxxx-xx-xx)

## Fixed
- Fixed missing imports in `Phalcon\Db\Adapter\AbstractAdapter`, `Phalcon\Db\Adapter\AdapterInterface`, `Phalcon\Db\Result\Pdo`, `Phalcon\Html\Tag` and `Phalcon\Tag\Select`. [#14249](https://github.com/phalcon/cphalcon/issues/14249)

# [4.0.0-beta.1](https://github.com/phalcon/cphalcon/releases/tag/v4.0.0-beta.1) (2019-07-14)

## Added
Expand Down
1 change: 1 addition & 0 deletions phalcon/Db/Adapter/AbstractAdapter.zep
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@

namespace Phalcon\Db\Adapter;

use Phalcon\Db\DialectInterface;
use Phalcon\Db\Adapter\AdapterInterface;
use Phalcon\Db\ColumnInterface;
use Phalcon\Db\Enum;
Expand Down
2 changes: 2 additions & 0 deletions phalcon/Db/Adapter/AdapterInterface.zep
View file
Open in desktop
Expand Up @@ -10,6 +10,8 @@

namespace Phalcon\Db\Adapter;

use Phalcon\Db\DialectInterface;
use Phalcon\Db\ResultInterface;
use Phalcon\Db\ColumnInterface;
use Phalcon\Db\IndexInterface;
use Phalcon\Db\RawValue;
Expand Down
3 changes: 2 additions & 1 deletion phalcon/Db/Result/Pdo.zep
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ namespace Phalcon\Db\Result;

use Phalcon\Db\Enum;
use Phalcon\Db\ResultInterface;
use Phalcon\Db\Adapter\AdapterInterface;

%{
#include <ext/pdo/php_pdo_driver.h>
Expand Down Expand Up @@ -61,7 +62,7 @@ class Pdo implements ResultInterface
/**
* Phalcon\Db\Result\Pdo constructor
*/
public function __construct(<Db\AdapterInterface> connection, <\PDOStatement> result,
public function __construct(<AdapterInterface> connection, <\PDOStatement> result,
sqlStatement = null, bindParams = null, bindTypes = null) -> void
{
let this->connection = connection,
Expand Down
3 changes: 2 additions & 1 deletion phalcon/Html/Tag.zep
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ use Phalcon\Escaper\EscaperInterface;
use Phalcon\Helper\Arr;
use Phalcon\Html\Exception;
use Phalcon\Url\UrlInterface;
use Phalcon\Mvc\Model\ResultsetInterface;

/**
* Phalcon\Html\Tag
Expand Down Expand Up @@ -1738,7 +1739,7 @@ class Tag implements InjectionAwareInterface
/**
* Generates the option values from a resultset
*/
private function renderSelectResultset(<ResulsetInterface> resultset, using, var value, string closeOption) -> string
private function renderSelectResultset(<ResultsetInterface> resultset, using, var value, string closeOption) -> string
{
var escaper, option, output, optionValue, optionText, parameters,
strOptionValue, strValue;
Expand Down
4 changes: 2 additions & 2 deletions phalcon/Tag/Select.zep
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ namespace Phalcon\Tag;
use Phalcon\Tag\Exception;
use Phalcon\Tag as BaseTag;
use Phalcon\Escaper\EscaperInterface;
use Phalcon\Mvc\Model\ResulsetInterface;
use Phalcon\Mvc\Model\ResultsetInterface;

/**
* Phalcon\Tag\Select
Expand Down Expand Up @@ -186,7 +186,7 @@ abstract class Select
* @param array using
*/
private static function optionsFromResultset(
<ResulsetInterface> resultset,
<ResultsetInterface> resultset,
var using,
var value,
string closeOption
Expand Down