8000 Fix some typos and grammar issues · symfony-cli/symfony-cli@63df11f · GitHub
[go: up one dir, main page]
Skip to content

Commit 63df11f

Browse files
javiereguiluzjaviereguiluz
committed
Fix some typos and grammar issues
1 parent 7e9dd18 commit 63df11f

File tree

9 files changed

+12
-13
lines changed

9 files changed

+12
-13
lines changed

‎commands/local_check_security.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ a specific "composer.lock" file.`,
8080
}
8181
defer f.Close()
8282

83-
// Ran inside a Github action, export vulns
83+
// Ran inside a GitHub action, export vulns
8484
output, _ := security.Format(vulns, "raw_json")
8585
if _, err = f.WriteString("vulns=" + string(output) + "\n"); err != nil {
8686
return console.Exit(fmt.Sprintf("unable to write into github output: %s", err), 127)

‎envs/docker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func normalizeDockerComposeProjectName(projectName string) string {
5858
// Port of https://github.com/docker/compose/blob/4e0fdd70bdae4f8d85e4ef9d0129ce445f3ece3c/compose/cli/command.py#L129-L130
5959
// (prior to 615c01c50a51408a7fdfed66ecccf73781e87f2c)
6060
// This was used in Docker Compose prior to 1.21.0, some users might still use
61-
// versions older though, so we keep this BC in the mean time.
61+
// versions older though, so we keep this BC in the meantime.
6262
func normalizeDockerComposeProjectNameLegacy(projectName string) string {
6363
return dockerComposeNormalizeRegexpLegacy.ReplaceAllString(strings.ToLower(projectName), "")
6464
}

‎local/fcgi_client/fcgiclient.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ type header struct {
8181
Reserved uint8
8282
}
8383

84-
// for padding so we don't have to allocate all the time
84+
// for padding, so we don't have to allocate all the time
8585
// not synchronized because we don't care what the contents are
8686
var pad [maxPad]byte
8787

@@ -322,7 +322,7 @@ func (w *streamReader) Read(p []byte) (n int, err error) {
322322
return
323323
}
324324

325-
// Do made the request and returns a io.Reader that translates the data read
325+
// Do makes the request and returns an io.Reader that translates the data read
326326
// from fcgi responder out of fcgi packet before returning it.
327327
func (f *FCGIClient) Do(p map[string]string, req io.Reader) (r io.Reader, err error) {
328328
err = f.writeBeginRequest(uint16(FCGI_RESPONDER), 0)
@@ -345,7 +345,7 @@ func (f *FCGIClient) Do(p map[string]string, req io.Reader) (r io.Reader, err er
345345
return
346346
}
347347

348-
// Request returns a HTTP Response with Header and Body
348+
// Request returns an HTTP Response with Header and Body
349349
// from fcgi responder
350350
func (f *FCGIClient) Request(p map[string]string, req io.Reader) (resp *http.Response, err error) {
351351
r, err := f.Do(p, req)

‎local/pid/pidfile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func New(dir string, args []string) *PidFile {
5656
// server or proxy
5757
path = filepath.Join(util.GetHomeDir(), "var", name(dir)+".pid")
5858
} else {
59-
// workers are stored in a sub-directory
59+
// workers are stored in a subdirectory
6060
path = filepath.Join(util.GetHomeDir(), "var", name(dir), name(command)+".pid")
6161
}
6262
// we need to load the existing file if there is one

‎local/project/project.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func realPassthru(documentRoot, passthru string) (string, error) {
111111
}
112112

113113
func guessDocumentRoot(path string) string {
114-
// for Symfony: check if public-dir is setup in composer.json first
114+
// for Symfony: check if public-dir is set up in composer.json first
115115
if b, err := ioutil.ReadFile(filepath.Join(path, "composer.json")); err == nil {
116116
var f map[string]interface{}
117117
if err := json.Unmarshal(b, &f); err == nil {

‎local/proxy/proxy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func New(config *Config, ca *cert.CA, logger *log.Logger, debug bool) *Proxy {
226226
backend := fmt.Sprintf("127.0.0.1:%d", pid.Port)
227227

228228
if hostPort != "443" {
229-
// No TLS termination required, let's go trough regular proxy
229+
// No TLS termination required, let's go through regular proxy
230230
return goproxy.OkConnect, backend
231231
}
232232

‎local/proxy/proxy_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"github.com/rs/zerolog"
3838
"github.com/symfony-cli/cert"
3939
"github.com/symfony-cli/symfony-cli/local/pid"
40-
. "gopkg.in/check.v1"
4140
)
4241

4342
func (s *ProxySuite) TestProxy(c *C) {
@@ -114,7 +113,7 @@ func (s *ProxySuite) TestProxy(c *C) {
114113
Timeout: 1 * time.Second,
115114
}
116115

117-
// Test proxying a request to a non registered project
116+
// Test proxying a request to a non-registered project
118117
{
119118
req, _ := http.NewRequest("GET", "https://foo.wip/", nil)
120119
req.Close = true

‎local/runner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func (r *Runner) Run() error {
186186

187187
timer.Stop()
188188
// when the command is really fast to run, it will be already
189-
// done here so we need to forward exit status as it has
189+
// done here, so we need to forward exit status as it has
190190
// finished later one
191191
go func() { cmdExitChan <- err }()
192192
case <-timer.C:

‎reexec/reexec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ func Background(homeDir string) error {
109109
os.Setenv("REEXEC_WATCH_PID", fmt.Sprint(Getppid()))
110110
// We are in a reexec.Restart call (probably after an upgrade), watch
111111
// REEXEC_SHELL_PID instead of direct parent.
112-
// For interactive sessions, this is not an issue, but for long running
113-
// processes like tunnel:open, if we don't do that, they will exits right
112+
// For interactive sessions, this is not an issue, but for long-running
113+
// processes like tunnel:open, if we don't do that, they will exit right
114114
// after returning back to the shell because the direct parent (the initial
115115
// process that got upgraded) is the one watched.
116116
if shellPID := os.Getenv("REEXEC_SHELL_PID"); shellPID != "" {

0 commit comments

Comments
 (0)
0