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

5.6.0 Release #16504

Merged
merged 52 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
4e009e1
prepping changelog for 5.5.1
niden Dec 26, 2023
3debc43
removing 'order' from 'count()
niden Dec 26, 2023
ba5cac0
added tests
niden Dec 26, 2023
5a7d943
phpcs
niden Dec 26, 2023
91e37a5
updating changelog
niden Dec 26, 2023
a71fa61
fixing tests
niden Dec 26, 2023
1f9f4cf
minor adjustment
niden Dec 26, 2023
54fd67f
sqlite test correction
niden Dec 26, 2023
aca7e22
trying to fix this test again
niden Dec 26, 2023
458e4a9
trying to remove warnings from the run
niden Dec 26, 2023
93d302b
trying a different approach for the path
niden Dec 26, 2023
1214a26
maybe this syntax?
niden Dec 26, 2023
3281f92
changing inputs for actions
niden Dec 26, 2023
53b6096
another try
niden Dec 26, 2023
a874279
reverting back
niden Dec 26, 2023
f22fc27
removing local variable
niden Dec 26, 2023
34e1620
correcting variable name
niden Dec 26, 2023
a98908e
Merge pull request #16485 from niden/T16471-count-orderby
niden Dec 26, 2023
f521a8f
correcting links in readme
niden Dec 26, 2023
b6b0c8b
moved code to abstractadapter; set PDO stringify and emulate_prepares…
niden Dec 27, 2023
92f1fd7
refreshing ext
niden Dec 27, 2023
7c2456e
updating changelog
niden Dec 27, 2023
2f2f769
removed constructor - leaving things as they are with PDO
niden Dec 27, 2023
97f2c69
updating changelog
niden Dec 27, 2023
87039f7
adjusting test
niden Dec 27, 2023
043a91a
Merge pull request #16486 from niden/T16474-emulate-prepares
niden Dec 27, 2023
48d7102
Model::toArray added parameter to ignore getters
rudiservo Jan 4, 2024
7212ba0
Merge pull request #16491 from rudiservo/i16490-model-toarray-serialize
niden Jan 4, 2024
ffeb995
Added return type for getReusableRecords
Jan 5, 2024
f46bf4e
Removed property comments in Select
Jan 5, 2024
8793a7f
Merge branch '5.0.x' into manager-return-types
niden Jan 5, 2024
750f56c
Merge pull request #16493 from kuhler-Stratege/manager-return-types
niden Jan 5, 2024
4a0a419
Merge pull request #16494 from kuhler-Stratege/select-delete-property…
niden Jan 5, 2024
7228f4d
documentation corrections and test addition
niden Dec 30, 2023
5da0657
mostly docblock corrections; returning self from datamapper
niden Jan 6, 2024
7dde460
correcting return types for reset
niden Jan 6, 2024
cbfb63a
reverting return types for datamapper
niden Jan 6, 2024
34b0acd
correcting return type for select
niden Jan 6, 2024
c2cf8e0
fixed apcu_* methods to ignore referenced values
niden Jan 6, 2024
3c13ddb
regenerating ext and build
niden Jan 6, 2024
9bb774a
Merge pull request #16497 from niden/T16489-apcu-fetch-2
Jeckerson Jan 7, 2024
379040f
reworking the toarray conditionals
niden Jan 9, 2024
d9be887
Merge pull request #16499 from niden/T16498-model-toarray-segfault
niden Jan 9, 2024
9606bfa
bumping version
niden Jan 9, 2024
a2222ee
updating version
niden Jan 9, 2024
087e70d
refreshing ext
niden Jan 9, 2024
28c9a04
Merge pull request #16500 from niden/5.0.x
Jeckerson Jan 9, 2024
18a9ac7
bumping to 5.6
niden Jan 9, 2024
c21137d
regenerating ext
niden Jan 9, 2024
e0c7f8e
updating changelog
niden Jan 9, 2024
eb1c97d
updating package description
niden Jan 9, 2024
feaa3de
Merge pull request #16503 from niden/5.0.x
niden Jan 9, 2024
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
Prev Previous commit
Next Next commit
reverting return types for datamapper
  • Loading branch information
niden committed Jan 6, 2024
commit cbfb63a3a5f68f8045382851547808cf8ae4bd25
36 changes: 9 additions & 27 deletions phalcon/DataMapper/Query/AbstractQuery.zep
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ abstract class AbstractQuery
/**
* Resets the internal array
*/
public function reset() -> <AbstractQuery>
public function reset() -> void
{
let this->store["COLUMNS"] = [],
this->store["FLAGS"] = [],
Expand All @@ -178,89 +178,71 @@ abstract class AbstractQuery
this->store["ORDER"] = [],
this->store["OFFSET"] = 0,
this->store["WHERE"] = [];

return this;
}

/**
* Resets the columns
*/
public function resetColumns() -> <AbstractQuery>
public function resetColumns() -> void
{
let this->store["COLUMNS"] = [];

return this;
}

/**
* Resets the from
*/
public function resetFrom() -> <AbstractQuery>
public function resetFrom() -> void
{
let this->store["FROM"] = [];

return this;
}

/**
* Resets the where
*/
public function resetWhere() -> <AbstractQuery>
public function resetWhere() -> void
{
let this->store["WHERE"] = [];

return this;
}

/**
* Resets the group by
*/
public function resetGroupBy() -> <AbstractQuery>
public function resetGroupBy() -> void
{
let this->store["GROUP"] = [];

return this;
}

/**
* Resets the having
*/
public function resetHaving() -> <AbstractQuery>
public function resetHaving() -> void
{
let this->store["HAVING"] = [];

return this;
}

/**
* Resets the order by
*/
public function resetOrderBy() -> <AbstractQuery>
public function resetOrderBy() -> void
{
let this->store["ORDER"] = [];

return this;
}

/**
* Resets the limit and offset
*/
public function resetLimit() -> <AbstractQuery>
public function resetLimit() -> void
{
let this->store["LIMIT"] = 0,
this->store["OFFSET"] = 0;

return this;
}

/**
* Resets the flags
*/
public function resetFlags() -> <AbstractQuery>
public function resetFlags() -> void
{
let this->store["FLAGS"] = [];

return this;
}

/**
Expand Down
4 changes: 1 addition & 3 deletions phalcon/DataMapper/Query/Delete.zep
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,11 @@ class Delete extends AbstractConditions
/**
* Resets the internal store
*/
public function reset() -> <Delete>
public function reset() -> void
{
parent::reset();

let this->store["FROM"] = "",
this->store["RETURNING"] = [];

return this;
}
}
4 changes: 1 addition & 3 deletions phalcon/DataMapper/Query/Insert.zep
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,12 @@ class Insert extends AbstractQuery
/**
* Resets the internal store
*/
public function reset() -> <Insert>
public function reset() -> void
{
parent::reset();

let this->store["FROM"] = "",
this->store["RETURNING"] = [];

return this;
}

/**
Expand Down
4 changes: 1 addition & 3 deletions phalcon/DataMapper/Query/Update.zep
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,12 @@ class Update extends AbstractConditions
/**
* Resets the internal store
*/
public function reset() -> <Update>
public function reset() -> void
{
parent::reset();

let this->store["FROM"] = "",
this->store["RETURNING"] = [];

return this;
}

/**
Expand Down