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

Migration support for new columns #431

Merged
merged 4 commits into from
Jun 23, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
updating stubs
  • Loading branch information
mattvb91 committed Jun 23, 2015
commit 485b69f5b378c7a705bef8c03bfbba827493c5c6
20 changes: 0 additions & 20 deletions ide/2.0.0/Phalcon/db/Column.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,6 @@ class Column implements \Phalcon\Db\ColumnInterface
*/
const TYPE_DOUBLE = 9;

/**
* Tinyblob abstract data type
*/
const TYPE_TINYBLOB = 10;

/**
* Blob abstract data type
*/
const TYPE_BLOB = 11;

/**
* Mediumblob abstract data type
*/
const TYPE_MEDIUMBLOB = 12;

/**
* Longblob abstract data type
*/
const TYPE_LONGBLOB = 13;

/**
* Bind Type Null
*/
Expand Down
45 changes: 45 additions & 0 deletions ide/2.0.4/Phalcon/Acl.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php

namespace Phalcon;

/**
* Phalcon\Acl
* This component allows to manage ACL lists. An access control list (ACL) is a list
* of permissions attached to an object. An ACL specifies which users or system processes
* are granted access to objects, as well as what operations are allowed on given objects.
* <code>
* $acl = new \Phalcon\Acl\Adapter\Memory();
* //Default action is deny access
* $acl->setDefaultAction(\Phalcon\Acl::DENY);
* //Create some roles
* $roleAdmins = new \Phalcon\Acl\Role('Administrators', 'Super-User role');
* $roleGuests = new \Phalcon\Acl\Role('Guests');
* //Add "Guests" role to acl
* $acl->addRole($roleGuests);
* //Add "Designers" role to acl
* $acl->addRole('Designers');
* //Define the "Customers" resource
* $customersResource = new \Phalcon\Acl\Resource('Customers', 'Customers management');
* //Add "customers" resource with a couple of operations
* $acl->addResource($customersResource, 'search');
* $acl->addResource($customersResource, array('create', 'update'));
* //Set access level for roles into resources
* $acl->allow('Guests', 'Customers', 'search');
* $acl->allow('Guests', 'Customers', 'create');
* $acl->deny('Guests', 'Customers', 'update');
* //Check whether role has access to the operations
* $acl->isAllowed('Guests', 'Customers', 'edit'); //Returns 0
* $acl->isAllowed('Guests', 'Customers', 'search'); //Returns 1
* $acl->isAllowed('Guests', 'Customers', 'create'); //Returns 1
* </code>
*/
abstract class Acl
{

const ALLOW = 1;


const DENY = 0;


}
145 changes: 145 additions & 0 deletions ide/2.0.4/Phalcon/Config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
<?php

namespace Phalcon;

/**
* Phalcon\Config
* Phalcon\Config is designed to simplify the access to, and the use of, configuration data within applications.
* It provides a nested object property based user interface for accessing this configuration data within
* application code.
* <code>
* $config = new \Phalcon\Config(array(
* "database" => array(
* "adapter" => "Mysql",
* "host" => "localhost",
* "username" => "scott",
* "password" => "cheetah",
* "dbname" => "test_db"
* ),
* "phalcon" => array(
* "controllersDir" => "../app/controllers/",
* "modelsDir" => "../app/models/",
* "viewsDir" => "../app/views/"
* )
* ));
* </code>
*/
class Config implements \ArrayAccess, \Countable
{

/**
* Phalcon\Config constructor
*
* @param array $arrayConfig
*/
public function __construct($arrayConfig = null) {}

/**
* Allows to check whether an attribute is defined using the array-syntax
* <code>
* var_dump(isset($config['database']));
* </code>
*
* @param mixed $index
* @return bool
*/
public function offsetExists($index) {}

/**
* Gets an attribute from the configuration, if the attribute isn't defined returns null
* If the value is exactly null or is not defined the default value will be used instead
* <code>
* echo $config->get('controllersDir', '../app/controllers/');
* </code>
*
* @param mixed $index
* @param mixed $defaultValue
*/
public function get($index, $defaultValue = null) {}

/**
* Gets an attribute using the array-syntax
* <code>
* print_r($config['database']);
* </code>
*
* @param mixed $index
* @return string
*/
public function offsetGet($index) {}

/**
* Sets an attribute using the array-syntax
* <code>
* $config['database'] = array('type' => 'Sqlite');
* </code>
*
* @param mixed $index
* @param mixed $value
*/
public function offsetSet($index, $value) {}

/**
* Unsets an attribute using the array-syntax
* <code>
* unset($config['database']);
* </code>
*
* @param mixed $index
*/
public function offsetUnset($index) {}

/**
* Merges a configuration into the current one
* <code>
* $appConfig = new \Phalcon\Config(array('database' => array('host' => 'localhost')));
* $globalConfig->merge($config2);
* </code>
*
* @param mixed $config
* @return Config
*/
public function merge(Config $config) {}

/**
* Converts recursively the object to an array
* <code>
* print_r($config->toArray());
* </code>
*
* @return array
*/
public function toArray() {}

/**
* Returns the count of properties set in the config
* <code>
* print count($config);
* </code>
* or
* <code>
* print $config->count();
* </code>
*
* @return int
*/
public function count() {}

/**
* Restores the state of a Phalcon\Config object
*
* @param array $data
* @return Config
*/
public static function __set_state($data) {}

/**
* Helper method for merge configs (forwarding nested config instance)
*
* @param Config $config
* @param Config $instance = null
* @return Config config
*/
protected final function _merge(Config $config, $instance = null) {}

}
Loading