Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
5c07033c
Commit
5c07033c
authored
Nov 02, 2013
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1123 from mongosoft/master
Typos
parents
ccb310cf
5d17dd06
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
12 additions
and
9 deletions
+12
-9
ActiveRecord.md
docs/api/db/ActiveRecord.md
+1
-1
authorization.md
docs/guide/authorization.md
+1
-1
i18n.md
docs/guide/i18n.md
+1
-1
query-builder.md
docs/guide/query-builder.md
+1
-1
validation.md
docs/guide/validation.md
+1
-1
view.md
docs/guide/view.md
+1
-1
Module.php
framework/yii/base/Module.php
+3
-3
QueryBuilder.php
framework/yii/db/sqlite/QueryBuilder.php
+1
-0
GettextMoFile.php
framework/yii/i18n/GettextMoFile.php
+2
-0
No files found.
docs/api/db/ActiveRecord.md
View file @
5c07033c
ActiveRecord implements the
[
Active Record design pattern
](
http://en.wikipedia.org/wiki/Active_record
)
.
ActiveRecord implements the
[
Active Record design pattern
](
http://en.wikipedia.org/wiki/Active_record
)
.
The idea is that an ActiveRecord object is associated with a row in a database table
The idea is that an ActiveRecord object is associated with a row in a database table
so object properties are mapped to colums of the corresponding database row.
so object properties are mapped to colum
n
s of the corresponding database row.
For example, a
`Customer`
object is associated with a row in the
`tbl_customer`
For example, a
`Customer`
object is associated with a row in the
`tbl_customer`
table. Instead of writing raw SQL statements to access the data in the table,
table. Instead of writing raw SQL statements to access the data in the table,
you can call intuitive methods available in the corresponding ActiveRecord class
you can call intuitive methods available in the corresponding ActiveRecord class
...
...
docs/guide/authorization.md
View file @
5c07033c
...
@@ -7,7 +7,7 @@ of controlling it.
...
@@ -7,7 +7,7 @@ of controlling it.
Access control basics
Access control basics
---------------------
---------------------
Basic acces control is very simple to implement using
[
[\yii\web\AccessControl
]
]:
Basic acces
s
control is very simple to implement using
[
[\yii\web\AccessControl
]
]:
```
php
```
php
class
SiteController
extends
Controller
class
SiteController
extends
Controller
...
...
docs/guide/i18n.md
View file @
5c07033c
...
@@ -121,7 +121,7 @@ extension. After installing and enabling it you will be able to use extended syn
...
@@ -121,7 +121,7 @@ extension. After installing and enabling it you will be able to use extended syn
that allows you to specify formatting style.
that allows you to specify formatting style.
Full reference is
[
available at ICU website
](
http://icu-project.org/apiref/icu4c/classMessageFormat.html
)
but since it's
Full reference is
[
available at ICU website
](
http://icu-project.org/apiref/icu4c/classMessageFormat.html
)
but since it's
a bit cryp
r
ic we have our own reference below.
a bit cryp
t
ic we have our own reference below.
### Numbers
### Numbers
...
...
docs/guide/query-builder.md
View file @
5c07033c
...
@@ -45,7 +45,7 @@ $query->select(['tbl_user.name AS author', 'tbl_post.title as title']) // <-- sp
...
@@ -45,7 +45,7 @@ $query->select(['tbl_user.name AS author', 'tbl_post.title as title']) // <-- sp
->
leftJoin
(
'tbl_post'
,
'tbl_post.user_id = tbl_user.id'
);
// <-- join with another table
->
leftJoin
(
'tbl_post'
,
'tbl_post.user_id = tbl_user.id'
);
// <-- join with another table
```
```
In the code above we've used
`leftJoin`
method to select from two related tables at the same time. Firs
r
t parameter
In the code above we've used
`leftJoin`
method to select from two related tables at the same time. First parameter
specifies table name and the second is the join condition. Query builder has the following methods to join tables:
specifies table name and the second is the join condition. Query builder has the following methods to join tables:
-
`innerJoin`
-
`innerJoin`
...
...
docs/guide/validation.md
View file @
5c07033c
...
@@ -8,7 +8,7 @@ Standard Yii validators
...
@@ -8,7 +8,7 @@ Standard Yii validators
-----------------------
-----------------------
Standard Yii validators could be specified using aliases instead of referring to class names. Here's the list of all
Standard Yii validators could be specified using aliases instead of referring to class names. Here's the list of all
validators budled with Yii with their most useful properties:
validators bu
n
dled with Yii with their most useful properties:
### `boolean`: [[BooleanValidator]]
### `boolean`: [[BooleanValidator]]
...
...
docs/guide/view.md
View file @
5c07033c
...
@@ -38,7 +38,7 @@ Widgets
...
@@ -38,7 +38,7 @@ Widgets
Widgets are a self-contained building blocks for your views. A widget may contain advanced logic, typically takes some
Widgets are a self-contained building blocks for your views. A widget may contain advanced logic, typically takes some
configuration and data and returns HTML. There is a good number of widgets bundled with Yii such as
[
active form
](
form.md
)
,
configuration and data and returns HTML. There is a good number of widgets bundled with Yii such as
[
active form
](
form.md
)
,
breadcrumbs, menu or
[
wrappers around bootstrap component framework
](
boostrap-widgets.md
)
. Additionally there are
breadcrumbs, menu or
[
wrappers around bootstrap component framework
](
boo
t
strap-widgets.md
)
. Additionally there are
extensions providing additional widgets such as official one for jQueryUI components.
extensions providing additional widgets such as official one for jQueryUI components.
In order to use widget you need to do the following:
In order to use widget you need to do the following:
...
...
framework/yii/base/Module.php
View file @
5c07033c
...
@@ -241,7 +241,7 @@ abstract class Module extends Component
...
@@ -241,7 +241,7 @@ abstract class Module extends Component
* Sets the directory that contains the controller classes.
* Sets the directory that contains the controller classes.
* @param string $path the directory that contains the controller classes.
* @param string $path the directory that contains the controller classes.
* This can be either a directory name or a path alias.
* This can be either a directory name or a path alias.
* @throws Exception if the directory is invalid
* @throws
InvalidParam
Exception if the directory is invalid
*/
*/
public
function
setControllerPath
(
$path
)
public
function
setControllerPath
(
$path
)
{
{
...
@@ -264,7 +264,7 @@ abstract class Module extends Component
...
@@ -264,7 +264,7 @@ abstract class Module extends Component
/**
/**
* Sets the directory that contains the view files.
* Sets the directory that contains the view files.
* @param string $path the root directory of view files.
* @param string $path the root directory of view files.
* @throws Exception if the directory is invalid
* @throws
InvalidParam
Exception if the directory is invalid
*/
*/
public
function
setViewPath
(
$path
)
public
function
setViewPath
(
$path
)
{
{
...
@@ -287,7 +287,7 @@ abstract class Module extends Component
...
@@ -287,7 +287,7 @@ abstract class Module extends Component
/**
/**
* Sets the directory that contains the layout files.
* Sets the directory that contains the layout files.
* @param string $path the root directory of layout files.
* @param string $path the root directory of layout files.
* @throws Exception if the directory is invalid
* @throws
InvalidParam
Exception if the directory is invalid
*/
*/
public
function
setLayoutPath
(
$path
)
public
function
setLayoutPath
(
$path
)
{
{
...
...
framework/yii/db/sqlite/QueryBuilder.php
View file @
5c07033c
...
@@ -80,6 +80,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
...
@@ -80,6 +80,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
* @param boolean $check whether to turn on or off the integrity check.
* @param boolean $check whether to turn on or off the integrity check.
* @param string $schema the schema of the tables. Meaningless for SQLite.
* @param string $schema the schema of the tables. Meaningless for SQLite.
* @param string $table the table name. Meaningless for SQLite.
* @param string $table the table name. Meaningless for SQLite.
* @return string the SQL statement for checking integrity
* @throws NotSupportedException this is not supported by SQLite
* @throws NotSupportedException this is not supported by SQLite
*/
*/
public
function
checkIntegrity
(
$check
=
true
,
$schema
=
''
,
$table
=
''
)
public
function
checkIntegrity
(
$check
=
true
,
$schema
=
''
,
$table
=
''
)
...
...
framework/yii/i18n/GettextMoFile.php
View file @
5c07033c
...
@@ -54,6 +54,7 @@ class GettextMoFile extends GettextFile
...
@@ -54,6 +54,7 @@ class GettextMoFile extends GettextFile
* @param string $context message context
* @param string $context message context
* @return array message translations. Array keys are source messages and array values are translated messages:
* @return array message translations. Array keys are source messages and array values are translated messages:
* source message => translated message.
* source message => translated message.
* @throws Exception if unable to read the MO file
*/
*/
public
function
load
(
$filePath
,
$context
)
public
function
load
(
$filePath
,
$context
)
{
{
...
@@ -128,6 +129,7 @@ class GettextMoFile extends GettextFile
...
@@ -128,6 +129,7 @@ class GettextMoFile extends GettextFile
* @param array $messages message translations. Array keys are source messages and array values are
* @param array $messages message translations. Array keys are source messages and array values are
* translated messages: source message => translated message. Note if the message has a context,
* translated messages: source message => translated message. Note if the message has a context,
* the message ID must be prefixed with the context with chr(4) as the separator.
* the message ID must be prefixed with the context with chr(4) as the separator.
* @throws Exception if unable to save the MO file
*/
*/
public
function
save
(
$filePath
,
$messages
)
public
function
save
(
$filePath
,
$messages
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment