Skip to content

Commit 5d99f9f

Browse files
taylorotwelltaylorotwell
committed
moving laravel 4 into develop branch.
1 parent 63bf89e commit 5d99f9f

File tree

463 files changed

+1289
-65192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

463 files changed

+1289
-65192
lines changed

‎.gitignore

+4-37
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,4 @@
1-
# Numerous always-ignore extensions
2-
*.diff
3-
*.err
4-
*.orig
5-
*.log
6-
*.rej
7-
*.swo
8-
*.swp
9-
*.vi
10-
*~
11-
*.sass-cache
12-
13-
# OS or Editor folders
14-
.DS_Store
15-
Thumbs.db
16-
.cache
17-
.project
18-
.settings
19-
.tmproj
20-
*.esproj
21-
nbproject
22-
23-
# Dreamweaver added files
24-
_notes
25-
dwsync.xml
26-
27-
# Komodo
28-
*.komodoproject
29-
.komodotools
30-
31-
# Folders to ignore
32-
.hg
33-
.svn
34-
.CVS
35-
intermediate
36-
publish
37-
.idea
1+
/vendor
2+
composer.phar
3+
composer.lock
4+
.DS_Store

‎.travis.yml

-6
This file was deleted.

‎CONTRIBUTING.md

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Pull request guidelines
1+
# Contribution Guidelines
22

3-
[GitHub pull requests](https://help.github.com/articles/using-pull-requests) are a great way for everyone in the community to contribute to the Laravel codebase. Found a bug? Just fix it in your fork and submit a pull request. This will then be reviewed, and, if found as good, merged into the main repository.
4-
5-
In order to keep the codebase clean, stable and at high quality, even with so many people contributing, some guidelines are necessary for high-quality pull requests:
6-
7-
- **Branch:** Unless they are immediate documentation fixes relevant for old versions, pull requests should be sent to the `develop` branch only. Make sure to select that branch as target when creating the pull request (GitHub will not automatically select it.)
8-
- **Documentation:** If you are adding a new feature or changing the API in any relevant way, this should be documented. The documentation files can be found directly in the core repository.
9-
- **Unit tests:** To keep old bugs from re-appearing and generally hold quality at a high level, the Laravel core is thoroughly unit-tested. Thus, when you create a pull request, it is expected that you unit test any new code you add. For any bug you fix, you should also add regression tests to make sure the bug will never appear again. If you are unsure about how to write tests, the core team or other contributors will gladly help.
3+
Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!

‎application/libraries/.gitignore renamed to ‎app/commands/.gitkeep

File renamed without changes.

‎app/config/app.php

+170
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
<?php
2+
3+
return array(
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Application Debug Mode
8+
|--------------------------------------------------------------------------
9+
|
10+
| When your application is in debug mode, detailed error messages with
11+
| stack traces will be shown on every error that occurs within your
12+
| application. If disabled, a simple generic error page is shown.
13+
|
14+
*/
15+
16+
'debug' => true,
17+
18+
/*
19+
|--------------------------------------------------------------------------
20+
| Application Timezone
21+
|--------------------------------------------------------------------------
22+
|
23+
| Here you may specify the default timezone for your application, which
24+
| will be used by the PHP date and date-time functions. We have gone
25+
| ahead and set this to a sensible default for you out of the box.
26+
|
27+
*/
28+
29+
'timezone' => 'UTC',
30+
31+
/*
32+
|--------------------------------------------------------------------------
33+
| Application Locale Configuration
34+
|--------------------------------------------------------------------------
35+
|
36+
| The application locale determines the default locale that will be used
37+
| by the translation service provider. You are free to set this value
38+
| to any of the locales which will be supported by the application.
39+
|
40+
*/
41+
42+
'locale' => 'en',
43+
44+
/*
45+
|--------------------------------------------------------------------------
46+
| Application Fallback Locale
47+
|--------------------------------------------------------------------------
48+
|
49+
| The fallback locale determines the locale to use when the current one
50+
| is not available. You may change the value to correspond to any of
51+
| the language folders that are provided through your application.
52+
|
53+
*/
54+
55+
'fallback_locale' => 'en',
56+
57+
/*
58+
|--------------------------------------------------------------------------
59+
| Encryption Key
60+
|--------------------------------------------------------------------------
61+
|
62+
| This key is used by the Illuminate encrypter service and should be set
63+
| to a random, long string, otherwise these encrypted values will not
64+
| be safe. Make sure to change it before deploying any application!
65+
|
66+
*/
67+
68+
'key' => 'YourSecretKey!!!',
69+
70+
/*
71+
|--------------------------------------------------------------------------
72+
| Autoloaded Service Providers
73+
|--------------------------------------------------------------------------
74+
|
75+
| The service providers listed here will be automatically loaded on the
76+
| request to your application. Feel free to add your own services to
77+
| this array to grant expanded functionality to your applications.
78+
|
79+
*/
80+
81+
'providers' => array(
82+
83+
'Illuminate\Foundation\Providers\ArtisanServiceProvider',
84+
'Illuminate\Auth\AuthServiceProvider',
85+
'Illuminate\Cache\CacheServiceProvider',
86+
'Illuminate\Foundation\Providers\CommandCreatorServiceProvider',
87+
'Illuminate\Foundation\Providers\ComposerServiceProvider',
88+
'Illuminate\Routing\ControllerServiceProvider',
89+
'Illuminate\Cookie\CookieServiceProvider',
90+
'Illuminate\Database\DatabaseServiceProvider',
91+
'Illuminate\Encryption\EncryptionServiceProvider',
92+
'Illuminate\Filesystem\FilesystemServiceProvider',
93+
'Illuminate\Hashing\HashServiceProvider',
94+
'Illuminate\Foundation\Providers\KeyGeneratorServiceProvider',
95+
'Illuminate\Log\LogServiceProvider',
96+
'Illuminate\Mail\MailServiceProvider',
97+
'Illuminate\Database\MigrationServiceProvider',
98+
'Illuminate\Pagination\PaginationServiceProvider',
99+
'Illuminate\Foundation\Providers\PublisherServiceProvider',
100+
'Illuminate\Redis\RedisServiceProvider',
101+
'Illuminate\Database\SeedServiceProvider',
102+
'Illuminate\Foundation\Providers\ServerServiceProvider',
103+
'Illuminate\Session\SessionServiceProvider',
104+
'Illuminate\Foundation\Providers\TinkerServiceProvider',
105+
'Illuminate\Translation\TranslationServiceProvider',
106+
'Illuminate\Validation\ValidationServiceProvider',
107+
'Illuminate\View\ViewServiceProvider',
108+
'Illuminate\Workbench\WorkbenchServiceProvider',
109+
110+
),
111+
112+
/*
113+
|--------------------------------------------------------------------------
114+
| Service Provider Manifest
115+
|--------------------------------------------------------------------------
116+
|
117+
| The service provider manifest is used by Laravel to lazy load service
118+
| providers which are not needed for each request, as well to keep a
119+
| list of all of the services. Here, you may set its storage spot.
120+
|
121+
*/
122+
123+
'manifest' => __DIR__.'/../storage/meta',
124+
125+
/*
126+
|--------------------------------------------------------------------------
127+
| Class Aliases
128+
|--------------------------------------------------------------------------
129+
|
130+
| This array of class aliases will be registered when this application
131+
| is started. However, feel free to register as many as you wish as
132+
| the aliases are "lazy" loaded so they don't hinder performance.
133+
|
134+
*/
135+
136+
'aliases' => array(
137+
138+
'App' => 'Illuminate\Support\Facades\App',
139+
'Artisan' => 'Illuminate\Support\Facades\Artisan',
140+
'Auth' => 'Illuminate\Support\Facades\Auth',
141+
'Blade' => 'Illuminate\Support\Facades\Blade',
142+
'Cache' => 'Illuminate\Support\Facades\Cache',
143+
'Config' => 'Illuminate\Support\Facades\Config',
144+
'Controller' => 'Illuminate\Routing\Controllers\Controller',
145+
'Cookie' => 'Illuminate\Support\Facades\Cookie',
146+
'Crypt' => 'Illuminate\Support\Facades\Crypt',
147+
'DB' => 'Illuminate\Support\Facades\DB',
148+
'Eloquent' => 'Illuminate\Database\Eloquent\Model',
149+
'Event' => 'Illuminate\Support\Facades\Event',
150+
'File' => 'Illuminate\Support\Facades\File',
151+
'Hash' => 'Illuminate\Support\Facades\Hash',
152+
'Input' => 'Illuminate\Support\Facades\Input',
153+
'Lang' => 'Illuminate\Support\Facades\Lang',
154+
'Log' => 'Illuminate\Support\Facades\Log',
155+
'Mail' => 'Illuminate\Support\Facades\Mail',
156+
'Paginator' => 'Illuminate\Support\Facades\Paginator',
157+
'Redirect' => 'Illuminate\Support\Facades\Redirect',
158+
'Redis' => 'Illuminate\Support\Facades\Redis',
159+
'Request' => 'Illuminate\Support\Facades\Request',
160+
'Response' => 'Illuminate\Support\Facades\Response',
161+
'Route' => 'Illuminate\Support\Facades\Route',
162+
'Schema' => 'Illuminate\Support\Facades\Schema',
163+
'Session' => 'Illuminate\Support\Facades\Session',
164+
'URL' => 'Illuminate\Support\Facades\URL',
165+
'Validator' => 'Illuminate\Support\Facades\Validator',
166+
'View' => 'Illuminate\Support\Facades\View',
167+
168+
),
169+
170+
);

‎app/config/auth.php

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
3+
return array(
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Default Authentication Driver
8+
|--------------------------------------------------------------------------
9+
|
10+
| This option controls the authentication driver that will be utilized.
11+
| This drivers manages the retrieval and authentication of the users
12+
| attempting to get access to protected areas of your application.
13+
|
14+
| Supported: "database", "eloquent"
15+
|
16+
*/
17+
18+
'driver' => 'eloquent',
19+
20+
/*
21+
|--------------------------------------------------------------------------
22+
| Authentication Model
23+
|--------------------------------------------------------------------------
24+
|
25+
| When using the "Eloquent" authentication driver, we need to know which
26+
| Eloquent model should be used to retrieve your users. Of course, it
27+
| is often just the "User" model but you may use whatever you like.
28+
|
29+
*/
30+
31+
'model' => 'User',
32+
33+
/*
34+
|--------------------------------------------------------------------------
35+
| Authentication Table
36+
|--------------------------------------------------------------------------
37+
|
38+
| When using the "Database" authentication driver, we need to know which
39+
| table should be used to retrieve your users. We have chosen a basic
40+
| default value but you may easily change it to any table you like.
41+
|
42+
*/
43+
44+
'table' => 'users',
45+
46+
);

‎app/config/cache.php

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?php
2+
3+
return array(
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Default Cache Driver
8+
|--------------------------------------------------------------------------
9+
|
10+
| This option controls the default cache "driver" that will be used when
11+
| using the Caching library. Of course, you may use other drivers any
12+
| time you wish. This is the default when another is not specified.
13+
|
14+
| Supported: "file", "database", "apc", "memcached", "redis", "array"
15+
|
16+
*/
17+
18+
'driver' => 'file',
19+
20+
/*
21+
|--------------------------------------------------------------------------
22+
| File Cache Location
23+
|--------------------------------------------------------------------------
24+
|
25+
| When using the "file" cache driver, we need a location where the cache
26+
| files may be stored. A sensible default has been specified, but you
27+
| are free to change it to any other place on disk that you desire.
28+
|
29+
*/
30+
31+
'path' => __DIR__.'/../storage/cache',
32+
33+
/*
34+
|--------------------------------------------------------------------------
35+
| Database Cache Connection
36+
|--------------------------------------------------------------------------
37+
|
38+
| When using the "database" cache driver you may specify the connection
39+
| that should be used to store the cached items. When this option is
40+
| null the default database connection will be utilized for cache.
41+
|
42+
*/
43+
44+
'connection' => null,
45+
46+
/*
47+
|--------------------------------------------------------------------------
48+
| Database Cache Table
49+
|--------------------------------------------------------------------------
50+
|
51+
| When using the "database" cache driver we need to know the table that
52+
| should be used to store the cached items. A default table name has
53+
| been provided but you're free to change it however you deem fit.
54+
|
55+
*/
56+
57+
'table' => 'cache',
58+
59+
/*
60+
|--------------------------------------------------------------------------
61+
| Memcached Servers
62+
|--------------------------------------------------------------------------
63+
|
64+
| Now you may specify an array of your Memcached servers that should be
65+
| used when utilizing the Memcached cache driver. All of the servers
66+
| should contain a value for "host", "port", and "weight" options.
67+
|
68+
*/
69+
70+
'memcached' => array(
71+
72+
array('host' => '127.0.0.1', 'port' => 11211, 'weight' => 100),
73+
74+
),
75+
76+
/*
77+
|--------------------------------------------------------------------------
78+
| Cache Key Prefix
79+
|--------------------------------------------------------------------------
80+
|
81+
| When utilizing a RAM based store such as APC or Memcached, there might
82+
| be other applications utilizing the same cache. So, we'll specify a
83+
| value to get prefixed to all our keys so we can avoid collisions.
84+
|
85+
*/
86+
87+
'prefix' => 'laravel',
88+
89+
);

0 commit comments

Comments
 (0)