| 
						
					 | 
					
						
						
							
						
						c3c9d1fd97
					 | 
					
						
						
							
							Merge branch 'master' into SamMousa-indexby-after-relations-9342
						
						
						
						
						
						
						
						Conflicts:
	framework/db/Query.php 
						
						
					 | 
					
						2018-02-15 23:38:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b9cbc56330
					 | 
					
						
						
							
							Fixed yii\db\ActiveRecord::with() unable to use relation defined via attached behavior in case asArray is enabled
						
						
						
						
						
						
					 | 
					
						2018-01-23 12:46:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						afd59a18ec
					 | 
					
						
						
							
							Merge branch 'master' into indexby-after-relations-9342
						
						
						
						
						
						
					 | 
					
						2017-10-08 00:52:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a8c3d537b
					 | 
					
						
						
							
							Enable phpdoc_summary rule in php-cs-fixer config (#14675)
						
						
						
						
						
						
						
						* Enable `phpdoc_summary` rule in php-cs-fixer config.
* Fix case in "PHPDoc". 
						
						
					 | 
					
						2017-08-21 11:19:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba0ab403b5
					 | 
					
						
						
							
							Added php-cs-fixer coding standards validation to Travis CI (#14100)
						
						
						
						
						
						
						
						* php-cs-fixer: PSR2 rule.
* php-cs-fixer: PSR2 rule - fix views.
* Travis setup refactoring.
* Add php-cs-fixer to travis cs tests.
* Fix tests on hhvm-3.12
* improve travis config
* composer update
* revert composer update
* improve travis config
* Fix CS.
* Extract config to separate classes.
* Extract config to separate classes.
* Add file header.
* Force short array syntax.
* binary_operator_spaces fixer
* Fix broken tests
* cast_spaces fixer
* concat_space fixer
* dir_constant fixer
* ereg_to_preg fixer
* function_typehint_space fixer
* hash_to_slash_comment fixer
* is_null fixer
* linebreak_after_opening_tag fixer
* lowercase_cast fixer
* magic_constant_casing fixer
* modernize_types_casting fixer
* native_function_casing fixer
* new_with_braces fixer
* no_alias_functions fixer
* no_blank_lines_after_class_opening fixer
* no_blank_lines_after_phpdoc fixer
* no_empty_comment fixer
* no_empty_phpdoc fixer
* no_empty_statement fixer
* no_extra_consecutive_blank_lines fixer
* no_leading_import_slash fixer
* no_leading_namespace_whitespace fixer
* no_mixed_echo_print fixer
* no_multiline_whitespace_around_double_arrow fixer
* no_multiline_whitespace_before_semicolons fixer
* no_php4_constructor fixer
* no_short_bool_cast fixer
* no_singleline_whitespace_before_semicolons fixer
* no_spaces_around_offset fixer
* no_trailing_comma_in_list_call fixer
* no_trailing_comma_in_singleline_array fixer
* no_unneeded_control_parentheses fixer
* no_unused_imports fixer
* no_useless_return fixer
* no_whitespace_before_comma_in_array fixer
* no_whitespace_in_blank_line fixer
* not_operator_with_successor_space fixer
* object_operator_without_whitespace fixer
* ordered_imports fixer
* php_unit_construct fixer
* php_unit_dedicate_assert fixer
* php_unit_fqcn_annotation fixer
* phpdoc_indent fixer
* phpdoc_no_access fixer
* phpdoc_no_empty_return fixer
* phpdoc_no_package fixer
* phpdoc_no_useless_inheritdoc fixer
* Fix broken tests
* phpdoc_return_self_reference fixer
* phpdoc_single_line_var_spacing fixer
* phpdoc_single_line_var_spacing fixer
* phpdoc_to_comment fixer
* phpdoc_trim fixer
* phpdoc_var_without_name fixer
* psr4 fixer
* self_accessor fixer
* short_scalar_cast fixer
* single_blank_line_before_namespace fixer
* single_quote fixer
* standardize_not_equals fixer
* ternary_operator_spaces fixer
* trailing_comma_in_multiline_array fixer
* trim_array_spaces fixer
* protected_to_private fixer
* unary_operator_spaces fixer
* whitespace_after_comma_in_array fixer
* `parent::setRules()` -> `$this->setRules()`
* blank_line_after_opening_tag fixer
* Update finder config.
* Revert changes for YiiRequirementChecker.
* Fix array formatting.
* Add missing import.
* Fix CS for new code merged from master.
* Fix some indentation issues. 
						
						
					 | 
					
						2017-06-12 12:25:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e26bc50441
					 | 
					
						
						
							
							Fixed wrong variable returned.
						
						
						
						
						
						
					 | 
					
						2017-03-31 10:27:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						afb93bf743
					 | 
					
						
						
							
							Apply grouping after loading relations.
						
						
						
						
						
						
					 | 
					
						2017-03-30 16:01:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7c7d751e67
					 | 
					
						
						
							
							Fixes #12015 Changed visibility yii\db\ActiveQueryTrait::createModels() from private to protected
						
						
						
						
						
						
					 | 
					
						2016-11-08 23:49:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4aa935e69e
					 | 
					
						
						
							
							Fixes #12055: Changed boolean to bool and integer to int in phpdoc
						
						
						
						
						
						
					 | 
					
						2016-11-07 02:51:39 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c5a60ce2ec
					 | 
					
						
						
							
							Avoid new $this->modelClass in ActiveQuery::findWith()
						
						
						
						
						
						
						
						reduces the issue described in #8639 to `joinWith()` and `asArray()`.
close #10940 
						
						
					 | 
					
						2016-02-25 18:26:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9ae21e5df2
					 | 
					
						
						
							
							phpDoc of joinWith updated to \yii\db\ActiveQuery
						
						
						
						
						
						
					 | 
					
						2016-01-12 12:20:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2b6ceb1eb7
					 | 
					
						
						
							
							phpDoc updated
						
						
						
						
						
						
					 | 
					
						2016-01-12 10:10:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cd87d67f34
					 | 
					
						
						
							
							Global DOCS update: ~~~ replaced with ```
						
						
						
						
						
						
					 | 
					
						2015-12-02 23:15:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						68c30c1034
					 | 
					
						
						
							
							Replace aliases of functions
						
						
						
						
						
						
					 | 
					
						2015-06-29 22:59:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						67658cf57d
					 | 
					
						
						
							
							Replaced static with $this in phpdoc since current IDEs are finally able to handle it correctly
						
						
						
						
						
						
					 | 
					
						2015-05-31 13:39:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f11bdfa2a7
					 | 
					
						
						
							
							Grammar fix: followings -> following
						
						
						
						
						
						
					 | 
					
						2015-04-21 15:08:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e6b1fd5c6
					 | 
					
						
						
							
							Local loop variable added to fix #7271 bug
						
						
						
						
						
						
					 | 
					
						2015-02-15 17:25:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						98759201ac
					 | 
					
						
						
							
							Fixed bug #7271. Classes that call '*::populateRecord()' after retrieving data from ddbb call now the method on the class of the model returned by '*::instantiate()'. Tests for mysql, elasticsearch and mongodb attached.
						
						
						
						
						
						
					 | 
					
						2015-02-15 17:25:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0c14f47f9a
					 | 
					
						
						
							
							Fixes #3793: Changed inline autocomplete hints style to get more IDEs support
						
						
						
						
						
						
					 | 
					
						2014-06-20 17:40:00 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						871ae29c9c
					 | 
					
						
						
							
							call asArray() instead of assign directly
						
						
						
						
						
						
						
						fixes #3891 
						
						
					 | 
					
						2014-06-16 08:49:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c1445871f4
					 | 
					
						
						
							
							Correction of many errors code inspection.
						
						
						
						
						
						
						
						Adjustments code according to the standards.
Adding missing PHPDoc comment. 
						
						
					 | 
					
						2014-04-16 19:29:07 -03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						44dbb2235a
					 | 
					
						
						
							
							cleanup docs
						
						
						
						
						
						
					 | 
					
						2014-04-03 20:13:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						54e08f3f01
					 | 
					
						
						
							
							fixed build break.
						
						
						
						
						
						
					 | 
					
						2014-04-03 11:57:49 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8b4dfcc876
					 | 
					
						
						
							
							Fixes #2955: Changed the signature of ActiveQuery constructors and ActiveRecord::createQuery() to simplify customizing ActiveQuery classes
						
						
						
						
						
						
					 | 
					
						2014-04-03 10:36:52 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a35ef1ce7a
					 | 
					
						
						
							
							added andOnCondition and orOnCondition to ActiveQuery
						
						
						
						
						
						
						
						fixes #2957 
						
						
					 | 
					
						2014-04-02 16:17:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf3c75147d
					 | 
					
						
						
							
							reverted breaking PHPdoc codestyle changes
						
						
						
						
						
						
						
						issue #2852 
						
						
					 | 
					
						2014-03-23 20:51:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5f8a4dc22
					 | 
					
						
						
							
							Reformat code te be PSR-2 compatible
						
						
						
						
						
						
					 | 
					
						2014-03-16 10:46:21 +06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb8237c1b7
					 | 
					
						
						
							
							merged ActiveQueryInterface and ActiveRelatioInterface
						
						
						
						
						
						
					 | 
					
						2014-02-20 16:15:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dd26d39dd8
					 | 
					
						
						
							
							Removed unused namespace imports
						
						
						
						
						
						
					 | 
					
						2014-02-07 13:26:00 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						16e1aff41b
					 | 
					
						
						
							
							renamed ActiveRecord::create() to populateRecord()
						
						
						
						
						
						
						
						- refactored elasticsearch AR to make type and index available in
  instantiate(), issue #1313
fixes #2281 
						
						
					 | 
					
						2014-02-03 14:07:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b119576041
					 | 
					
						
						
							
							Fixes #2016: removed ability to declare scopes in ActiveRecord leaving it to ActiveQuery. Changed documentation accordingly.
						
						
						
						
						
						
					 | 
					
						2014-01-17 22:07:02 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						349f2c9e32
					 | 
					
						
						
							
							phpdoc fixes, unused variable
						
						
						
						
						
						
					 | 
					
						2014-01-12 23:40:21 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0c38655217
					 | 
					
						
						
							
							psr-4 move
						
						
						
						
						
						
					 | 
					
						2014-01-10 21:41:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |